epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge branch 'master' into link

Browse Source 
* master: (226 commits)
  ioc/db: testdbGetFieldEqual() detect zero size
  Cleanup in asLib
  Allow whitespace before comments in AS config files
  Supress MS warning C4251
  Add a plan to std/filters/test/syncTest.c
  Fix dbUnitTest.c
  avoid void* +=
  Fix and test for macLib losing error status
  update notes
  libCom/test: ipAddrToAsciiTest skip cleanup unless valgrind is possible
  libCom/test: add ipAddrToAsciiTest to testHarness
  db/test: dbPutGetTest check dbGet() of long string field
  db: dbGet() ensure long string nil and actual string length
  db/test: dbPutGetTest check for dbGet() attribute crash
  db: fix dbGet() for attributes as long string
  db/test: dbPutGetTest add test for lp:1678494
  db: fix dbGet() of link fields as DBF_CHAR
  dbUnitTest: add testdbGetArrFieldEqual()
  db/test: add dbPutGetTest
  Update release notes as per Michael's review comment
  ...

Conflicts:
	src/ioc/db/dbLink.c
	src/ioc/db/test/Makefile
	src/std/dev/devSoSoftCallback.c
	src/std/rec/boRecord.c
	src/std/rec/dfanoutRecord.c
	src/std/rec/longinRecord.c
	src/std/rec/longoutRecord.c
This commit is contained in:
Michael Davidsaver
2017-04-21 17:20:12 -04:00
parent 54e94a1e12 6c062981fb
commit 066984e11d
917 changed files with 5634 additions and 6246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/std/rec/stringinRecord.c
View File

@@ -7,8 +7,6 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$ */
/* recStringin.c - Record Support Routines for Stringin records */
/*
* Author: Janet Anderson
@@ -42,8 +40,8 @@
/* Create RSET - Record Support Entry Table*/
#define report NULL
#define initialize NULL
static long init_record(stringinRecord *, int);
static long process(stringinRecord *);
static long init_record(struct dbCommon *, int);
static long process(struct dbCommon *);
#define special NULL
#define get_value NULL
#define cvt_dbaddr NULL
@@ -92,8 +90,9 @@ static void monitor(stringinRecord *);
static long readValue(stringinRecord *);
static long init_record(stringinRecord *prec, int pass)
static long init_record(struct dbCommon *pcommon, int pass)
{
struct stringinRecord *prec = (struct stringinRecord *)pcommon;
STATIC_ASSERT(sizeof(prec->oval)==sizeof(prec->val));
struct stringindset *pdset = (struct stringindset *) prec->dset;
@@ -126,9 +125,10 @@ static long init_record(stringinRecord *prec, int pass)
/*
*/
static long process(stringinRecord *prec)
static long process(struct dbCommon *pcommon)
{
struct stringindset *pdset = (struct stringindset *)(prec->dset);
struct stringinRecord *prec = (struct stringinRecord *)pcommon;
struct stringindset *pdset = (struct stringindset *)(prec->dset);
long status;
unsigned char pact=prec->pact;