From c574722a9bf9fc0bf37e4e58bdac4a96f2c62f36 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Tue, 11 Sep 2012 15:19:29 -0500
Subject: [PATCH] catools: Fix syntax error from vxWorks gcc.
---
src/catools/tool_lib.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/catools/tool_lib.c b/src/catools/tool_lib.c
index 380457756a..ddead11151 100644
--- a/src/catools/tool_lib.c
+++ b/src/catools/tool_lib.c
@@ -447,9 +447,11 @@ char *dbr2str (const void *value, unsigned type)
dbr_char_t *s = (dbr_char_t*) dbr_value_ptr(pv->value, pv->dbrType); \
size_t len = strlen((char*)s); \
unsigned long elems = reqElems && (reqElems < pv->nElems) ? reqElems : pv->nElems; \
+ int dlen; \
+ char *d; \
if (len < elems) elems = len; \
- int dlen = epicsStrnEscapedFromRawSize((char*)s, elems); \
- char *d = calloc(dlen+1, sizeof(char)); \
+ dlen = epicsStrnEscapedFromRawSize((char*)s, elems); \
+ d = calloc(dlen+1, sizeof(char)); \
if(d) { \
epicsStrnEscapedFromRaw(d, dlen+1, (char*)s, elems); \
printf("%c%s", fieldSeparator, d); \
--
GitLab