* linksup/master: (112 commits)
ioc/dbStatic: rename link debugging info tags
jlif future proof for 64-bit json parser
Demonstrate and use numeric literals in calc args
separate jlink and lset debug flags
std/link: runtime conditional debugging in calc/const
std/rec/test: extend linkRetargetLink w/ jlink
ioc/db: dbUnitTest add testdbPutArrFieldOk()
ioc/db: cleanup dbEvent freeLists
ioc/db: dbUnitTest testMonitor leaks dbChannel
std/link: all calc example
jlink conditional debug print
ioc/as: dbCore needs ca
Additional linkInitTest checks
Minimize work done in readLocked routine
Minimize work done in readLocked() routine
Cosmetic changes to various soft device supports
Enhancements to subArray record & soft device support
Fix bug in eventRecord::init_record
Updates to Release Notes and links.html
Make dbLinkIs{Constant|Volatile}() return only true/false
...
Conflicts:
documentation/RELEASE_NOTES.html
src/ioc/db/dbAccess.c
* cahuge/master:
replace caLimitArray with EPICS_CA_AUTO_MAX_ARRAY_BYTES
ca: fix export caLimitArray on win32
rsrv: export variable caLimitArray
rsrv: optional max_array_bytes
cas: simplify buffer alloc
ca: large array free list is optional
rsrv: support larger than max. array bytes
pcas: support larger than max array bytes
ca: support alloc larger than max array bytes
* launchpad/3.15:
rename iocshFind -> iocshFindCommand
Added patch
Changed function outputs to remove pointer to next function.
more whitespace
whitespace
Added functions to allow access to what functions and variables the ioc shell has registered.
missing include
ioc/dbStatic: dbFreeBase() don't double free alias'd records
ioc/dbStatic: plug leak in dbFreeBase()
ioc/dbStatic: whitespace
Fix indentation warning from GCC
libCom/test: errlog test more verbose
libCom: STATIC_ASSERT use c++11 static_assert when possible
Check for empty PV names in Perl catools
Conflicts:
src/std/rec/subRecord.c
* camodern/master:
cas: ignore CA client version older than v4.4
rsrv: remove !CA_V44() code
rsrv: no ca exception response to UDP
rsrv: ignore CA client version older than v4.4
cas: honor DOREPLY for TCP searches
cas: ignore echo and unexpected UDP
rsrv: send channel create failure
rsrv: UDP search ignore DOREPLY
rsrv: ignore echo and unexpected UDP
Conflicts:
src/ca/legacy/pcas/generic/casDGClient.cc
* launchpad/3.14:
ioc/dbStatic: dbFreeBase() don't double free alias'd records
ioc/dbStatic: plug leak in dbFreeBase()
ioc/dbStatic: whitespace
Fix indentation warning from GCC
libCom/test: errlog test more verbose
libCom: STATIC_ASSERT use c++11 static_assert when possible
Check for empty PV names in Perl catools
Conflicts:
src/ioc/dbStatic/dbStaticLib.c
src/libCom/osi/epicsAssert.h
dbFreeBase() has been broken since alias() was introduced.
Traversal of recList in the function assumed that dbDeleteRecord()
remove only the current dbRecordNode. However, dbDeleteRecord()
called dbDeleteAliases() which removes alias dbRecordNode s.
If this happens (as it often does) to be the node immediately
after the real node, dbFreeBase() will then iterate using
a ellDelete()d node.
Michael Davidsaver