remove some more sprintf
svn path=/trunk/; revision=15458
This commit is contained in:
parent
a34e7e3d03
commit
6657ebb4c9
|
@ -639,9 +639,10 @@ DEBUG_ENTRY("dissect_per_boolean");
|
||||||
value=0;
|
value=0;
|
||||||
}
|
}
|
||||||
if(hf_index!=-1){
|
if(hf_index!=-1){
|
||||||
char str[256];
|
char *str;
|
||||||
hfi = proto_registrar_get_nth(hf_index);
|
hfi = proto_registrar_get_nth(hf_index);
|
||||||
sprintf(str,"%c%c%c%c %c%c%c%c %s: %s",
|
str=ep_alloc(256);
|
||||||
|
g_snprintf(str, 256, "%c%c%c%c %c%c%c%c %s: %s",
|
||||||
mask&0x80?'0'+value:'.',
|
mask&0x80?'0'+value:'.',
|
||||||
mask&0x40?'0'+value:'.',
|
mask&0x40?'0'+value:'.',
|
||||||
mask&0x20?'0'+value:'.',
|
mask&0x20?'0'+value:'.',
|
||||||
|
@ -790,7 +791,7 @@ DEBUG_ENTRY("dissect_per_constrained_integer");
|
||||||
val = min;
|
val = min;
|
||||||
} else if(range<=255) {
|
} else if(range<=255) {
|
||||||
/* 10.5.7.1 */
|
/* 10.5.7.1 */
|
||||||
char str[256];
|
char *str;
|
||||||
int i, bit, length;
|
int i, bit, length;
|
||||||
|
|
||||||
length=1;
|
length=1;
|
||||||
|
@ -812,7 +813,8 @@ DEBUG_ENTRY("dissect_per_constrained_integer");
|
||||||
num_bits=8;
|
num_bits=8;
|
||||||
}
|
}
|
||||||
/* prepare the string */
|
/* prepare the string */
|
||||||
sprintf(str, "%s: ", hfi->name);
|
str=ep_alloc(256);
|
||||||
|
g_snprintf(str, 256, "%s: ", hfi->name);
|
||||||
for(bit=0;bit<((int)(offset&0x07));bit++){
|
for(bit=0;bit<((int)(offset&0x07));bit++){
|
||||||
if(bit&&(!(bit%4))){
|
if(bit&&(!(bit%4))){
|
||||||
strcat(str, " ");
|
strcat(str, " ");
|
||||||
|
|
|
@ -912,9 +912,10 @@ static int get_size_by_coltype(int servertype)
|
||||||
*/
|
*/
|
||||||
static char *data_to_string(void *data, guint col_type, guint col_size)
|
static char *data_to_string(void *data, guint col_type, guint col_size)
|
||||||
{
|
{
|
||||||
static char result[256];
|
char *result;
|
||||||
guint i;
|
guint i;
|
||||||
|
|
||||||
|
result=ep_alloc(256);
|
||||||
switch(col_type) {
|
switch(col_type) {
|
||||||
case SYBVARCHAR:
|
case SYBVARCHAR:
|
||||||
/* strncpy(result, (char *)data, col_size); */
|
/* strncpy(result, (char *)data, col_size); */
|
||||||
|
@ -924,13 +925,13 @@ static char *data_to_string(void *data, guint col_type, guint col_size)
|
||||||
result[i] = '\0';
|
result[i] = '\0';
|
||||||
break;
|
break;
|
||||||
case SYBINT2:
|
case SYBINT2:
|
||||||
sprintf(result, "%d", *(short *)data);
|
g_snprintf(result, 256, "%d", *(short *)data);
|
||||||
break;
|
break;
|
||||||
case SYBINT4:
|
case SYBINT4:
|
||||||
sprintf(result, "%d", *(int *)data);
|
g_snprintf(result, 256, "%d", *(int *)data);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
sprintf(result, "Unexpected column_type %d", col_type);
|
g_snprintf(result, 256, "Unexpected column_type %d", col_type);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
|
|
Loading…
Reference in New Issue