From 43322335dfae49b62930f95b634265ac936968f9 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Wed, 30 May 2018 01:46:29 -0700 Subject: [PATCH 1/2] Add -V flag to ca client tools to show EPICS and CA versions. --- src/ca/client/tools/caget.c | 17 +++++++++++------ src/ca/client/tools/cainfo.c | 14 ++++++++++---- src/ca/client/tools/camonitor.c | 15 ++++++++++----- src/ca/client/tools/caput.c | 17 +++++++++++------ 4 files changed, 42 insertions(+), 21 deletions(-) diff --git a/src/ca/client/tools/caget.c b/src/ca/client/tools/caget.c index a2b0e08b0..ffc4244f0 100644 --- a/src/ca/client/tools/caget.c +++ b/src/ca/client/tools/caget.c @@ -28,12 +28,13 @@ #include #include -#include -#include +#include "epicsStdlib.h" +#include "epicsString.h" -#include -#include -#include +#include "alarm.h" +#include "cadef.h" +#include "epicsGetopt.h" +#include "epicsVersion.h" #include "tool_lib.h" @@ -55,6 +56,7 @@ static void usage (void) { fprintf (stderr, "\nUsage: caget [options] ...\n\n" " -h: Help: Print this message\n" + " -V: Version: Show EPICS and CA versions\n" "Channel Access options:\n" " -w : Wait time, specifies CA timeout, default is %f second(s)\n" " -c: Asynchronous get (use ca_get_callback and wait for completion)\n" @@ -389,11 +391,14 @@ int main (int argc, char *argv[]) LINE_BUFFER(stdout); /* Configure stdout buffering */ - while ((opt = getopt(argc, argv, ":taicnhsSe:f:g:l:#:d:0:w:p:F:")) != -1) { + while ((opt = getopt(argc, argv, ":taicnhsSVe:f:g:l:#:d:0:w:p:F:")) != -1) { switch (opt) { case 'h': /* Print usage */ usage(); return 0; + case 'V': + printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() ); + return 0; case 't': /* Terse output mode */ complainIfNotPlainAndSet(&format, terse); break; diff --git a/src/ca/client/tools/cainfo.c b/src/ca/client/tools/cainfo.c index 924c34b10..e881ef240 100644 --- a/src/ca/client/tools/cainfo.c +++ b/src/ca/client/tools/cainfo.c @@ -22,10 +22,11 @@ */ #include -#include +#include "epicsStdlib.h" +#include "epicsVersion.h" -#include -#include +#include "cadef.h" +#include "epicsGetopt.h" #include "tool_lib.h" @@ -36,12 +37,14 @@ void usage (void) { fprintf (stderr, "\nUsage: cainfo [options] ...\n\n" " -h: Help: Print this message\n" + " -V: Version: Show EPICS and CA versions\n" "Channel Access options:\n" " -w : Wait time, specifies CA timeout, default is %f second(s)\n" " -s : Call ca_client_status with the specified interest level\n" " -p : CA priority (0-%u, default 0=lowest)\n" "\nExample: cainfo my_channel another_channel\n\n" , DEFAULT_TIMEOUT, CA_PRIORITY_MAX); + fprintf (stderr, "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() ); } @@ -137,11 +140,14 @@ int main (int argc, char *argv[]) LINE_BUFFER(stdout); /* Configure stdout buffering */ - while ((opt = getopt(argc, argv, ":nhw:s:p:")) != -1) { + while ((opt = getopt(argc, argv, ":nhVw:s:p:")) != -1) { switch (opt) { case 'h': /* Print usage */ usage(); return 0; + case 'V': + printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() ); + return 0; case 'w': /* Set CA timeout value */ if(epicsScanDouble(optarg, &caTimeout) != 1) { diff --git a/src/ca/client/tools/camonitor.c b/src/ca/client/tools/camonitor.c index 307dad8d6..09c965ebb 100644 --- a/src/ca/client/tools/camonitor.c +++ b/src/ca/client/tools/camonitor.c @@ -24,11 +24,12 @@ */ #include -#include +#include "epicsStdlib.h" #include +#include "epicsVersion.h" -#include -#include +#include "cadef.h" +#include "epicsGetopt.h" #include "tool_lib.h" @@ -44,7 +45,8 @@ void usage (void) { fprintf (stderr, "\nUsage: camonitor [options] ...\n" "\n" - " -h: Help; Print this message\n" + " -h: Help: Print this message\n" + " -V: Version: Show EPICS and CA versions\n" "Channel Access options:\n" " -w : Wait time, specifies CA timeout, default is %f second(s)\n" " -m : Specify CA event mask to use. is any combination of\n" @@ -209,11 +211,14 @@ int main (int argc, char *argv[]) LINE_BUFFER(stdout); /* Configure stdout buffering */ - while ((opt = getopt(argc, argv, ":nhm:sSe:f:g:l:#:0:w:t:p:F:")) != -1) { + while ((opt = getopt(argc, argv, ":nhVm:sSe:f:g:l:#:0:w:t:p:F:")) != -1) { switch (opt) { case 'h': /* Print usage */ usage(); return 0; + case 'V': + printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() ); + return 0; case 'n': /* Print ENUM as index numbers */ enumAsNr=1; break; diff --git a/src/ca/client/tools/caput.c b/src/ca/client/tools/caput.c index f6dcc21cd..a7ea618a6 100644 --- a/src/ca/client/tools/caput.c +++ b/src/ca/client/tools/caput.c @@ -31,12 +31,13 @@ #include #include -#include +#include "epicsStdlib.h" -#include -#include -#include -#include +#include "cadef.h" +#include "epicsGetopt.h" +#include "epicsEvent.h" +#include "epicsString.h" +#include "epicsVersion.h" #include "tool_lib.h" @@ -59,6 +60,7 @@ void usage (void) fprintf (stderr, "\nUsage: caput [options] \n" " caput -a [options] ...\n\n" " -h: Help: Print this message\n" + " -V: Version: Show EPICS and CA versions\n" "Channel Access options:\n" " -w : Wait time, specifies CA timeout, default is %f second(s)\n" " -c: Asynchronous put (use ca_put_callback and wait for completion)\n" @@ -279,11 +281,14 @@ int main (int argc, char *argv[]) LINE_BUFFER(stdout); /* Configure stdout buffering */ putenv("POSIXLY_CORRECT="); /* Behave correct on GNU getopt systems */ - while ((opt = getopt(argc, argv, ":cnlhatsS#:w:p:F:")) != -1) { + while ((opt = getopt(argc, argv, ":cnlhatsVS#:w:p:F:")) != -1) { switch (opt) { case 'h': /* Print usage */ usage(); return 0; + case 'V': + printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() ); + return 0; case 'n': /* Force interpret ENUM as index number */ enumAsNr = 1; enumAsString = 0; From 9a8860b77197ff6ab1cf4e9a65e5d24aaf10a51f Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Mon, 5 Nov 2018 18:44:46 -0800 Subject: [PATCH 2/2] Expand tabs and revert #include lines to <> instead of quotes. --- src/ca/client/tools/caget.c | 14 +++++++------- src/ca/client/tools/cainfo.c | 10 +++++----- src/ca/client/tools/camonitor.c | 10 +++++----- src/ca/client/tools/caput.c | 14 +++++++------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/ca/client/tools/caget.c b/src/ca/client/tools/caget.c index ffc4244f0..383a8e1ce 100644 --- a/src/ca/client/tools/caget.c +++ b/src/ca/client/tools/caget.c @@ -28,12 +28,12 @@ #include #include -#include "epicsStdlib.h" -#include "epicsString.h" +#include +#include -#include "alarm.h" -#include "cadef.h" -#include "epicsGetopt.h" +#include +#include +#include #include "epicsVersion.h" #include "tool_lib.h" @@ -396,8 +396,8 @@ int main (int argc, char *argv[]) case 'h': /* Print usage */ usage(); return 0; - case 'V': - printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() ); + case 'V': + printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() ); return 0; case 't': /* Terse output mode */ complainIfNotPlainAndSet(&format, terse); diff --git a/src/ca/client/tools/cainfo.c b/src/ca/client/tools/cainfo.c index e881ef240..2263249fb 100644 --- a/src/ca/client/tools/cainfo.c +++ b/src/ca/client/tools/cainfo.c @@ -22,11 +22,11 @@ */ #include -#include "epicsStdlib.h" +#include #include "epicsVersion.h" -#include "cadef.h" -#include "epicsGetopt.h" +#include +#include #include "tool_lib.h" @@ -145,8 +145,8 @@ int main (int argc, char *argv[]) case 'h': /* Print usage */ usage(); return 0; - case 'V': - printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() ); + case 'V': + printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() ); return 0; case 'w': /* Set CA timeout value */ if(epicsScanDouble(optarg, &caTimeout) != 1) diff --git a/src/ca/client/tools/camonitor.c b/src/ca/client/tools/camonitor.c index 09c965ebb..a3fdecd55 100644 --- a/src/ca/client/tools/camonitor.c +++ b/src/ca/client/tools/camonitor.c @@ -24,12 +24,12 @@ */ #include -#include "epicsStdlib.h" +#include #include #include "epicsVersion.h" -#include "cadef.h" -#include "epicsGetopt.h" +#include +#include #include "tool_lib.h" @@ -216,8 +216,8 @@ int main (int argc, char *argv[]) case 'h': /* Print usage */ usage(); return 0; - case 'V': - printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() ); + case 'V': + printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() ); return 0; case 'n': /* Print ENUM as index numbers */ enumAsNr=1; diff --git a/src/ca/client/tools/caput.c b/src/ca/client/tools/caput.c index a7ea618a6..d6db8ba7f 100644 --- a/src/ca/client/tools/caput.c +++ b/src/ca/client/tools/caput.c @@ -31,12 +31,12 @@ #include #include -#include "epicsStdlib.h" +#include -#include "cadef.h" -#include "epicsGetopt.h" -#include "epicsEvent.h" -#include "epicsString.h" +#include +#include +#include +#include #include "epicsVersion.h" #include "tool_lib.h" @@ -286,8 +286,8 @@ int main (int argc, char *argv[]) case 'h': /* Print usage */ usage(); return 0; - case 'V': - printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() ); + case 'V': + printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() ); return 0; case 'n': /* Force interpret ENUM as index number */ enumAsNr = 1;