* 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.
Permit record's use as a look-up-table by reading constant
input array data in dset::read_sa() routine.
Move sub-array operation into a separate function.
Extract subarray from constant INP value at device init.
Reduce the work done inside readLocked() to a minimum.
Limit NELM value to at most MALM in record init routine.
Look up event handle /after/ the device init routine has been run,
in case it modified the event name in VAL. That didn't used to
be possible because constant links couldn't return strings.
