File 0001-2967265-Code-cleanup-in-frontend-sfcc-sfcclient.c.patch of Package sblim-sfcc
From eb303d3f600e6f381cf4a5e2dd179391663f27a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Wed, 10 Mar 2010 15:34:44 +0100
Subject: [PATCH 01/11] 2967265 Code cleanup in frontend/sfcc/sfcclient.c
---
frontend/sfcc/sfcclient.c | 55 +++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/frontend/sfcc/sfcclient.c b/frontend/sfcc/sfcclient.c
index be1345c..e631327 100644
--- a/frontend/sfcc/sfcclient.c
+++ b/frontend/sfcc/sfcclient.c
@@ -206,12 +206,14 @@ void * newStringBuffer (int s)
char * value2Chars (CMPIType type, CMPIValue *value)
{
- char str[2048], *p;
+#define SBUFLEN 256
+ char str[SBUFLEN], *p;
unsigned int size;
CMPIString *cStr;
str[0]=0;
if (type & CMPI_ARRAY) {
+ fprintf (stderr, "*** value2Chars not implemented for Array *** ");
}
else if (type & CMPI_ENC) {
@@ -235,7 +237,7 @@ char * value2Chars (CMPIType type, CMPIValue *value)
case CMPI_filter:
break;
-
+
case CMPI_string:
case CMPI_numericString:
case CMPI_booleanString:
@@ -243,12 +245,12 @@ char * value2Chars (CMPIType type, CMPIValue *value)
case CMPI_classNameString:
return strdup((value->string && value->string->hdl) ?
(char*)value->string->hdl : "NULL");
-
+
case CMPI_dateTime:
if (value->dateTime) {
- cStr=CMGetStringFormat(value->dateTime,NULL);
- p = strdup((char *) cStr->hdl);
- CMRelease(cStr);
+ cStr = CMGetStringFormat(value->dateTime, NULL);
+ p = strdup((char *) cStr->hdl);
+ CMRelease(cStr);
} else
p = strdup("NULL");
return p;
@@ -270,29 +272,29 @@ char * value2Chars (CMPIType type, CMPIValue *value)
switch (type) {
case CMPI_uint8:
- sprintf(str, "%u", value->uint8);
- return strdup(str);
+ snprintf(str, SBUFLEN, "%u", value->uint8);
+ break;
case CMPI_sint8:
- sprintf(str, "%d", value->sint8);
- return strdup(str);
+ snprintf(str, SBUFLEN, "%d", value->sint8);
+ break;
case CMPI_uint16:
- sprintf(str, "%u", value->uint16);
- return strdup(str);
+ snprintf(str, SBUFLEN, "%u", value->uint16);
+ break;
case CMPI_sint16:
- sprintf(str, "%d", value->sint16);
- return strdup(str);
+ snprintf(str, SBUFLEN, "%d", value->sint16);
+ break;
case CMPI_uint32:
- sprintf(str, "%lu", value->uint32);
- return strdup(str);
+ snprintf(str, SBUFLEN, "%lu", value->uint32);
+ break;
case CMPI_sint32:
- sprintf(str, "%ld", value->sint32);
- return strdup(str);
+ snprintf(str, SBUFLEN, "%ld", value->sint32);
+ break;
case CMPI_uint64:
- sprintf(str, "%llu", value->uint64);
- return strdup(str);
+ snprintf(str, SBUFLEN, "%llu", value->uint64);
+ break;
case CMPI_sint64:
- sprintf(str, "%lld", value->sint64);
- return strdup(str);
+ snprintf(str, SBUFLEN, "%lld", value->sint64);
+ break;
}
}
@@ -300,13 +302,14 @@ char * value2Chars (CMPIType type, CMPIValue *value)
switch (type) {
case CMPI_real32:
- sprintf(str, "%g", value->real32);
- return strdup(str);
+ snprintf(str, SBUFLEN, "%g", value->real32);
+ break;
case CMPI_real64:
- sprintf(str, "%g", value->real64);
- return strdup(str);
+ snprintf(str, SBUFLEN, "%g", value->real64);
+ break;
}
}
+#undef SBUFLEN
return strdup(str);
}
--
1.6.4.2