Argonne National Laboratory

Experimental Physics and
Industrial Control System

2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  <2017 Index 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  <2017
<== Date ==> <== Thread ==>

Subject: Database Field type in db_access.h
From: Jeong Han Lee <citadel.lee@gmail.com>
To: core-talk@aps.anl.gov
Date: Wed, 3 May 2017 13:11:59 +0200
Hi,

  Please look at db_access.patch, and let me know what you think.

  LAST_TYPE should be DBF_NO_ACCESS instead of DBF_DOUBLE, is it right?



  Here are my environment as

$ git rev-parse HEAD
0bbb381efda8d48ab7d3f7c5f69efbeaa4674d98

$ git remote -v
origin  https://git.launchpad.net/epics-base (fetch)
origin  https://git.launchpad.net/epics-base (push)


I didn't commit my change anywhere, so I just generated the db_access.patch via
$ git diff --no-prefix > db_access.patch


  I just execute the following command (got from Michael)
$ git format-patch -k -1

  It created the another enclosed file as 0001-ioc-rsrv-fix-C89-issue.patch


  Thanks,
  Han
diff --git src/ca/client/db_access.h src/ca/client/db_access.h
index 92aa5d0..99d441d 100644
--- src/ca/client/db_access.h
+++ src/ca/client/db_access.h
@@ -70,7 +70,7 @@ typedef epicsOldString dbr_class_name_t;
 #define	DBF_LONG	5
 #define	DBF_DOUBLE	6
 #define DBF_NO_ACCESS	7
-#define	LAST_TYPE	DBF_DOUBLE
+#define	LAST_TYPE	DBF_NO_ACCESS
 #define	VALID_DB_FIELD(x)	((x >= 0) && (x <= LAST_TYPE))
 #define	INVALID_DB_FIELD(x)	((x < 0) || (x > LAST_TYPE))
 
From 0bbb381efda8d48ab7d3f7c5f69efbeaa4674d98 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Tue, 2 May 2017 21:06:35 -0400
Subject: ioc/rsrv: fix C89 issue

---
 src/ioc/rsrv/camessage.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/ioc/rsrv/camessage.c b/src/ioc/rsrv/camessage.c
index a174cb2..26a865a 100644
--- a/src/ioc/rsrv/camessage.c
+++ b/src/ioc/rsrv/camessage.c
@@ -1198,6 +1198,8 @@ static int claim_ciu_action ( caHdrLargeArray *mp,
 {
     int status;
     struct channel_in_use *pciu;
+    struct dbChannel *dbch;
+    char *pName = (char *) pPayload;
 
     /*
      * The available field is used (abused)
@@ -1210,9 +1212,6 @@ static int claim_ciu_action ( caHdrLargeArray *mp,
     if (!CA_V44(client->minor_version_number))
         return RSRV_ERROR; /* shouldn't actually get here due to VSUPPORTED test in camessage() */
 
-    struct dbChannel *dbch;
-    char *pName = (char *) pPayload;
-
     /*
      * check the sanity of the message
      */
-- 
2.1.4


Replies:
Re: Database Field type in db_access.h Michael Davidsaver

Navigate by Date:
Prev: Re: changes to libCom/osi/os/osdThread.c to be used for RTEMS 4.12 Heinz Junkes
Next: Re: Database Field type in db_access.h Michael Davidsaver
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  <2017
Navigate by Thread:
Prev: Jenkins build is back to normal : epics-base-3.16-mac #101 APS Jenkins
Next: Re: Database Field type in db_access.h Michael Davidsaver
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  <2017
ANJ, 03 May 2017 Valid HTML 4.01! · Home · News · About · Base · Modules · Extensions · Distributions · Download ·
· EPICS V4 · IRMIS · Talk · Bugs · Documents · Links · Licensing ·