From 7233e6f9d3bf6e5e57436cb135a7e533a2932b47 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Thu, 10 Feb 2000 17:45:37 +0000 Subject: [PATCH] self define ERROR and OK --- src/util/ca_test.c | 22 +++++++--------------- src/util/ca_test_main.c | 4 ++-- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/util/ca_test.c b/src/util/ca_test.c index d077e35ec..094bc54e1 100644 --- a/src/util/ca_test.c +++ b/src/util/ca_test.c @@ -43,14 +43,6 @@ #include #include -#ifndef ERROR -#define ERROR -1 -#endif - -#ifndef OK -#define OK 0 -#endif - #ifndef LOCAL #define LOCAL static #endif @@ -113,7 +105,7 @@ LOCAL int cagft(char *pname) status = ca_pend_io(2.0); if(status != ECA_NORMAL){ printf("Not Found %s\n", pname); - return ERROR; + return -1; } printf("name:\t%s\n", ca_name(chan_id)); @@ -155,7 +147,7 @@ LOCAL int cagft(char *pname) if(!outstanding){ printf("\n\n"); - return OK; + return 0; } if (outstanding==oldOut) { @@ -163,7 +155,7 @@ LOCAL int cagft(char *pname) } } - return ERROR; + return -1; } @@ -212,7 +204,7 @@ char *pvalue if (((*pname < ' ') || (*pname > 'z')) || ((*pvalue < ' ') || (*pvalue > 'z'))){ printf("\nusage \"pv name\",\"value\"\n"); - return ERROR; + return -1; } /* @@ -223,7 +215,7 @@ char *pvalue status = ca_pend_io(2.0); if(status != ECA_NORMAL){ printf("Not Found %s\n", pname); - return ERROR; + return -1; } printf("name:\t%s\n", ca_name(chan_id)); @@ -311,13 +303,13 @@ skip_rest: if(!outstanding){ printf("\n\n"); - return OK; + return 0; } ntries--; } - return ERROR; + return -1; } diff --git a/src/util/ca_test_main.c b/src/util/ca_test_main.c index 3464536d0..03c7a61e7 100644 --- a/src/util/ca_test_main.c +++ b/src/util/ca_test_main.c @@ -46,7 +46,7 @@ int main(int argc, char **argv) printf("%s\n",argv[0]); argv++; argc--; } - return ERROR; + return -1; } @@ -65,7 +65,7 @@ int main(int argc, char **argv) return ca_test(argv[1], argv[2]); } else{ - return ERROR; + return -1; } }