From 7c81b6920ede6a89cf4c3c7366816eb9e6f3d69d Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Tue, 24 Jul 2001 13:47:29 +0000 Subject: [PATCH] remove old style C; use signed char for cvtCharToString; get rid of some warning messages --- src/libCom/cvtFast/cvtFast.c | 8 ++++---- src/libCom/cvtFast/cvtFast.h | 23 +---------------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/src/libCom/cvtFast/cvtFast.c b/src/libCom/cvtFast/cvtFast.c index 6a9930e1b..4cd74e88a 100644 --- a/src/libCom/cvtFast/cvtFast.c +++ b/src/libCom/cvtFast/cvtFast.c @@ -298,7 +298,7 @@ int epicsShareAPI cvtDoubleToCompactString( static char digit_to_ascii[10]={'0','1','2','3','4','5','6','7','8','9'}; int epicsShareAPI cvtCharToString( - char source, + signed char source, char *pdest) { unsigned char val,temp; @@ -441,7 +441,7 @@ int epicsShareAPI cvtLongToString( } if(source<0) { if(source == LONG_MIN) { - sprintf(pdest,"%ld",LONG_MIN); + sprintf(pdest,"%ld",source); return((int)strlen(pdest)); } *pdest++ = '-'; @@ -511,7 +511,7 @@ int epicsShareAPI cvtLongToHexString( } if(source<0) { if(source == LONG_MIN) { - sprintf(pdest,"-0x%lx",LONG_MIN); + sprintf(pdest,"-0x%lx",source); return((int)strlen(pdest)); } *pdest++ = '-'; @@ -548,7 +548,7 @@ int epicsShareAPI cvtLongToOctalString( } if(source<0) { if(source == LONG_MIN) { - sprintf(pdest,"-0%lo",LONG_MIN); + sprintf(pdest,"-0%lo",source); return((int)strlen(pdest)); } *pdest++ = '-'; diff --git a/src/libCom/cvtFast/cvtFast.h b/src/libCom/cvtFast/cvtFast.h index 058420afb..25d9c3b6c 100644 --- a/src/libCom/cvtFast/cvtFast.h +++ b/src/libCom/cvtFast/cvtFast.h @@ -51,7 +51,6 @@ extern "C" { #include "shareLib.h" -#if defined(__STDC__) || defined(__cplusplus) /* * each of these functions return the number of characters "transmitted" @@ -70,7 +69,7 @@ epicsShareFunc int epicsShareAPI epicsShareFunc int epicsShareAPI cvtDoubleToCompactString(double value, char *pstring, unsigned short precision); epicsShareFunc int epicsShareAPI - cvtCharToString(char value, char *pstring); + cvtCharToString(signed char value, char *pstring); epicsShareFunc int epicsShareAPI cvtUcharToString(unsigned char value, char *pstring); epicsShareFunc int epicsShareAPI @@ -95,26 +94,6 @@ epicsShareFunc unsigned long epicsShareAPI cvtUlongToBits( unsigned bitFieldOffset, unsigned bitFieldLength); -#else /*__STDC__*/ - -epicsShareFunc int epicsShareAPI cvtFloatToString(); -epicsShareFunc int epicsShareAPI cvtDoubleToString(); -epicsShareFunc int epicsShareAPI cvtFloatToExpString(); -epicsShareFunc int epicsShareAPI cvtDoubleToExpString(); -epicsShareFunc int epicsShareAPI cvtFloatToCompactString(); -epicsShareFunc int epicsShareAPI cvtDoubleToCompactString(); -epicsShareFunc int epicsShareAPI cvtCharToString(); -epicsShareFunc int epicsShareAPI cvtUcharToString(); -epicsShareFunc int epicsShareAPI cvtShortToString(); -epicsShareFunc int epicsShareAPI cvtUshortToString(); -epicsShareFunc int epicsShareAPI cvtLongToString(); -epicsShareFunc int epicsShareAPI cvtUlongToString(); -epicsShareFunc int epicsShareAPI cvtLongToHexString(); -epicsShareFunc int epicsShareAPI cvtLongToOctalString(); -epicsShareFunc unsigned long epicsShareAPI cvtBitsToUlong(); -epicsShareFunc unsigned long epicsShareAPI cvtUlongToBits(); - -#endif /*__STDC__*/ #ifdef __cplusplus }