From 5003f11977d62ad2ac1f17ec0ecc99c8070c7c6a Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Mon, 13 Feb 1995 20:45:54 +0000 Subject: [PATCH] Resolve diffs between last commits --- src/util/ca_test.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/util/ca_test.c b/src/util/ca_test.c index adc95021f..c58d5dfdf 100644 --- a/src/util/ca_test.c +++ b/src/util/ca_test.c @@ -533,12 +533,7 @@ LOCAL void print_returned(short type, char *pbuffer, short count) { struct dbr_sts_long *pvalue = (struct dbr_sts_long *)pbuffer; -<<<<<<< ca_test.c - int *plong = &pvalue->value; - -======= dbr_long_t *plong = &pvalue->value; ->>>>>>> 1.11 printf("%2d %2d",pvalue->status,pvalue->severity); if(count==1) printf("\tValue: "); for (i = 0; i < count; i++,plong++){ @@ -635,11 +630,7 @@ LOCAL void print_returned(short type, char *pbuffer, short count) { struct dbr_time_long *pvalue = (struct dbr_time_long *)pbuffer; -<<<<<<< ca_test.c - int *plong = &pvalue->value; -======= dbr_long_t *plong = &pvalue->value; ->>>>>>> 1.11 printf("%2d %2d",pvalue->status,pvalue->severity); printf("\tTimeStamp: %lx %lx", pvalue->stamp.secPastEpoch, pvalue->stamp.nsec); @@ -739,11 +730,7 @@ LOCAL void print_returned(short type, char *pbuffer, short count) { struct dbr_gr_long *pvalue = (struct dbr_gr_long *)pbuffer; -<<<<<<< ca_test.c - int *plong = &pvalue->value; -======= dbr_long_t *plong = &pvalue->value; ->>>>>>> 1.11 printf("%2d %2d %.8s",pvalue->status,pvalue->severity, pvalue->units); printf("\n\t%8d %8d %8d %8d %8d %8d", @@ -844,11 +831,7 @@ LOCAL void print_returned(short type, char *pbuffer, short count) { struct dbr_ctrl_long *pvalue = (struct dbr_ctrl_long *)pbuffer; -<<<<<<< ca_test.c - int *plong = &pvalue->value; -======= dbr_long_t *plong = &pvalue->value; ->>>>>>> 1.11 printf("%2d %2d %.8s",pvalue->status,pvalue->severity, pvalue->units); printf("\n\t%8d %8d %8d %8d %8d %8d",