diff --git a/src/core/data.c b/src/core/data.c
index a0c2be11014d7de81b6aa1e12f9e31a39871f595..bf1f55ec8a1f053c2fce945e3ba161b1ea16eeaa 100644 (file)
--- a/src/core/data.c
+++ b/src/core/data.c
int
sdb_data_format(sdb_data_t *datum, char *buf, size_t buflen)
{
+ int ret = -1;
+
if ((! datum) || (! buf))
return -1;
switch (datum->type) {
case SDB_TYPE_INTEGER:
- snprintf(buf, buflen, "%"PRIi64, datum->data.integer);
+ ret = snprintf(buf, buflen, "%"PRIi64, datum->data.integer);
break;
case SDB_TYPE_DECIMAL:
- snprintf(buf, buflen, "%a", datum->data.decimal);
+ ret = snprintf(buf, buflen, "%a", datum->data.decimal);
break;
case SDB_TYPE_STRING:
- if (! datum->data.string) {
- strncpy(buf, "\"NULL\"", buflen);
- buf[buflen - 1] = '\0';
- return 0;
- }
- {
+ if (! datum->data.string)
+ ret = snprintf(buf, buflen, "\"NULL\"");
+ else {
char tmp[2 * strlen(datum->data.string) + 1];
size_t i, pos;
++pos;
}
tmp[pos] = '\0';
- snprintf(buf, buflen, "\"%s\"", tmp);
+ ret = snprintf(buf, buflen, "\"%s\"", tmp);
}
break;
case SDB_TYPE_DATETIME:
datum->data.datetime))
return -1;
tmp[sizeof(tmp) - 1] = '\0';
- snprintf(buf, buflen, "\"%s\"", tmp);
+ ret = snprintf(buf, buflen, "\"%s\"", tmp);
}
break;
case SDB_TYPE_BINARY:
++pos;
}
tmp[pos] = '\0';
- snprintf(buf, buflen, "\"%s\"", tmp);
+ ret = snprintf(buf, buflen, "\"%s\"", tmp);
}
break;
- default:
- return -1;
}
buf[buflen - 1] = '\0';
- return 0;
+ return ret;
} /* sdb_data_format */
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */