From b2f3bafa6401183a17247725dc223555a81d9998 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Fri, 28 Sep 2018 11:36:02 +0200 Subject: [PATCH 1/3] Removed usage message from dbStateCreate because it is not only a shell function but an API as well. But kept check for NULL. Added check for NULL in dbStateFind as well. --- modules/database/src/ioc/db/dbState.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/database/src/ioc/db/dbState.c b/modules/database/src/ioc/db/dbState.c index 88deab4e9..60819a023 100644 --- a/modules/database/src/ioc/db/dbState.c +++ b/modules/database/src/ioc/db/dbState.c @@ -37,6 +37,9 @@ dbStateId dbStateFind(const char *name) ELLNODE *node; dbStateId id; + if (!name) + return NULL; + for (node = ellFirst(&states); node; node = ellNext(node)) { id = CONTAINER(node, dbState, node); if (strcmp(id->name, name) == 0) @@ -50,10 +53,8 @@ dbStateId dbStateCreate(const char *name) dbStateId id; if (!name) - { - printf("Usage: dbStateCreate (\"name\")\n"); return NULL; - } + if ((id = dbStateFind(name))) return id; From e8e013d65ffd0a2de6a01fd1603d007984eb006b Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Fri, 28 Sep 2018 11:36:59 +0200 Subject: [PATCH 2/3] removed () from uage messages --- modules/database/src/ioc/db/dbAccess.c | 4 ++-- modules/database/src/ioc/db/dbBkpt.c | 6 +++--- modules/database/src/ioc/db/dbNotify.c | 2 +- modules/database/src/ioc/db/db_test.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/database/src/ioc/db/dbAccess.c b/modules/database/src/ioc/db/dbAccess.c index beef82919..f52b8881f 100644 --- a/modules/database/src/ioc/db/dbAccess.c +++ b/modules/database/src/ioc/db/dbAccess.c @@ -755,7 +755,7 @@ long dbBufferSize(short dbr_type, long options, long no_elements) int dbLoadDatabase(const char *file, const char *path, const char *subs) { if (!file) { - printf("Usage: dbLoadDatabase (\"file\", \"path\", \"subs\")\n"); + printf("Usage: dbLoadDatabase \"file\", \"path\", \"subs\"\n"); return -1; } return dbReadDatabase(&pdbbase, file, path, subs); @@ -766,7 +766,7 @@ int dbLoadRecords(const char* file, const char* subs) int status; if (!file) { - printf("Usage: dbLoadRecords (\"file\", \"subs\")\n"); + printf("Usage: dbLoadRecords \"file\", \"subs\"\n"); return -1; } status = dbReadDatabase(&pdbbase, file, 0, subs); diff --git a/modules/database/src/ioc/db/dbBkpt.c b/modules/database/src/ioc/db/dbBkpt.c index 03120f49d..b3fdd2da4 100644 --- a/modules/database/src/ioc/db/dbBkpt.c +++ b/modules/database/src/ioc/db/dbBkpt.c @@ -284,7 +284,7 @@ long dbb(const char *record_name) * Convert name to address */ if (!record_name) { - printf("Usage: dbb (\"record_name\")\n"); + printf("Usage: dbb \"record_name\"\n"); return -1; } status = dbNameToAddr(record_name, &addr); @@ -408,7 +408,7 @@ long dbd(const char *record_name) * Convert name to address */ if (!record_name) { - printf("Usage: dbd (\"record_name\")\n"); + printf("Usage: dbd \"record_name\"\n"); return -1; } status = dbNameToAddr(record_name, &addr); @@ -855,7 +855,7 @@ long dbap(const char *record_name) * Convert name to address */ if (!record_name) { - printf("Usage: dbap (\"record_name\")\n"); + printf("Usage: dbap \"record_name\"\n"); return -1; } status = dbNameToAddr(record_name, &addr); diff --git a/modules/database/src/ioc/db/dbNotify.c b/modules/database/src/ioc/db/dbNotify.c index 65c9c1dbf..c2420affc 100644 --- a/modules/database/src/ioc/db/dbNotify.c +++ b/modules/database/src/ioc/db/dbNotify.c @@ -597,7 +597,7 @@ long dbtpn(char *pname, char *pvalue) processNotify *ppn=NULL; if (!pname) { - printf("Usage: dbtpn (\"name\", \"value\")\n"); + printf("Usage: dbtpn \"name\", \"value\"\n"); return -1; } chan = dbChannelCreate(pname); diff --git a/modules/database/src/ioc/db/db_test.c b/modules/database/src/ioc/db/db_test.c index 6f58e061d..3d536f080 100644 --- a/modules/database/src/ioc/db/db_test.c +++ b/modules/database/src/ioc/db/db_test.c @@ -41,7 +41,7 @@ int gft(const char *pname) int i; if (!pname) { - printf("Usage: gft (\"name\")\n"); + printf("Usage: gft \"pv_name\"\n"); return -1; } chan = dbChannel_create(pname); @@ -99,7 +99,7 @@ int pft(const char *pname, const char *pvalue) double doublevalue; if (!pname || !pvalue) { - printf("Usage: pft (\"name\", \"value\")\n"); + printf("Usage: pft \"pv_name\", \"value\"\n"); return -1; } chan = dbChannel_create(pname); @@ -232,7 +232,7 @@ int tpn(const char *pname, const char *pvalue) processNotify *ppn = NULL; if (!pname || !pvalue) { - printf("Usage: tpn (\"name\", \"value\")\n"); + printf("Usage: tpn \"pv_name\", \"value\"\n"); return -1; } chan = dbChannel_create(pname); From 9b328a0ca4b5fdb913576024d09ef6d3ff5105b8 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Fri, 28 Sep 2018 11:38:29 +0200 Subject: [PATCH 3/3] Removed usage messages from epicsEnvSet except for vxWorks but kept the check for NULL. For vxWorks removed the () from usage message. --- modules/libcom/src/osi/os/Darwin/osdEnv.c | 6 +----- modules/libcom/src/osi/os/default/osdEnv.c | 6 +----- modules/libcom/src/osi/os/iOS/osdEnv.c | 6 +----- modules/libcom/src/osi/os/vxWorks/osdEnv.c | 2 +- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/modules/libcom/src/osi/os/Darwin/osdEnv.c b/modules/libcom/src/osi/os/Darwin/osdEnv.c index e7e90097f..e6206c3d8 100644 --- a/modules/libcom/src/osi/os/Darwin/osdEnv.c +++ b/modules/libcom/src/osi/os/Darwin/osdEnv.c @@ -35,11 +35,7 @@ */ epicsShareFunc void epicsShareAPI epicsEnvSet (const char *name, const char *value) { - if (!name) { - printf ("Usage: epicsEnvSet (\"name\", \"value\")\n"); - return; - } - + if (!name) return; iocshEnvClear(name); setenv(name, value, 1); } diff --git a/modules/libcom/src/osi/os/default/osdEnv.c b/modules/libcom/src/osi/os/default/osdEnv.c index d7f95099f..b284a86af 100644 --- a/modules/libcom/src/osi/os/default/osdEnv.c +++ b/modules/libcom/src/osi/os/default/osdEnv.c @@ -36,11 +36,7 @@ epicsShareFunc void epicsShareAPI epicsEnvSet (const char *name, const char *val { char *cp; - if (!name) { - printf ("Usage: epicsEnvSet (\"name\", \"value\")\n"); - return; - } - + if (!name) return; iocshEnvClear(name); cp = mallocMustSucceed (strlen (name) + strlen (value) + 2, "epicsEnvSet"); diff --git a/modules/libcom/src/osi/os/iOS/osdEnv.c b/modules/libcom/src/osi/os/iOS/osdEnv.c index c1ffd3694..fdc457003 100644 --- a/modules/libcom/src/osi/os/iOS/osdEnv.c +++ b/modules/libcom/src/osi/os/iOS/osdEnv.c @@ -32,11 +32,7 @@ */ epicsShareFunc void epicsShareAPI epicsEnvSet (const char *name, const char *value) { - if (!name) { - printf ("Usage: epicsEnvSet (\"name\", \"value\")\n"); - return; - } - + if (!name) return; iocshEnvClear(name); setenv(name, value, 1); } diff --git a/modules/libcom/src/osi/os/vxWorks/osdEnv.c b/modules/libcom/src/osi/os/vxWorks/osdEnv.c index ebc06af13..9245ae735 100644 --- a/modules/libcom/src/osi/os/vxWorks/osdEnv.c +++ b/modules/libcom/src/osi/os/vxWorks/osdEnv.c @@ -38,7 +38,7 @@ epicsShareFunc void epicsShareAPI epicsEnvSet (const char *name, const char *val char *cp; if (!name) { - printf ("Usage: epicsEnvSet (\"name\", \"value\")\n"); + printf ("Usage: epicsEnvSet \"name\", \"value\"\n"); return; }