X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fdata.c;h=914946fbec6761d3e7b4345742ddbd63668106c1;hb=59947b2a42517a95b9c4451c8ebca0c0d8aadc11;hp=d34a4dd711250041cd26d463575535bd70522f4a;hpb=9f22d297f78323cb6ae9e8de66f9390333425df9;p=sysdb.git

diff --git a/src/core/data.c b/src/core/data.c
index d34a4dd..914946f 100644
--- a/src/core/data.c
+++ b/src/core/data.c
@@ -681,9 +681,9 @@ sdb_data_strcmp(const sdb_data_t *d1, const sdb_data_t *d2)
 
 	CMP_NULL(d1, d2);
 
-	if (sdb_data_format(d1, d1_str, sizeof(d1_str), SDB_UNQUOTED) < 0)
+	if (! sdb_data_format(d1, d1_str, sizeof(d1_str), SDB_UNQUOTED))
 		return SDB_CMP(sizeof(d1_str), sizeof(d2_str));
-	if (sdb_data_format(d2, d2_str, sizeof(d2_str), SDB_UNQUOTED) < 0)
+	if (! sdb_data_format(d2, d2_str, sizeof(d2_str), SDB_UNQUOTED))
 		return SDB_CMP(sizeof(d1_str), sizeof(d2_str));
 
 	return strcasecmp(d1_str, d2_str);
@@ -871,7 +871,11 @@ sdb_data_strlen(const sdb_data_t *datum)
 	if (! datum)
 		return 0;
 
-	if (datum->type == SDB_TYPE_INTEGER) {
+	if (sdb_data_isnull(datum)) {
+		/* NULL */
+		return 4;
+	}
+	else if (datum->type == SDB_TYPE_INTEGER) {
 		/* log(64) */
 		return 20;
 	}
@@ -914,20 +918,24 @@ sdb_data_strlen(const sdb_data_t *datum)
 	return 0;
 } /* sdb_data_strlen */
 
-int
+size_t
 sdb_data_format(const sdb_data_t *datum, char *buf, size_t buflen, int quoted)
 {
 	char tmp[sdb_data_strlen(datum) + 1];
 	char *data = NULL;
 	bool is_null = 0;
-	int ret = -1;
+	size_t ret = 0;
 
 	size_t i, pos;
 
-	if ((! datum) || (! buf) || (! buflen))
-		return -1;
+	if (! datum)
+		return 0;
 
-	if (datum->type == SDB_TYPE_INTEGER) {
+	if (datum->type == SDB_TYPE_NULL) {
+		strncpy(buf, "NULL", buflen);
+		ret = 4;
+	}
+	else if (datum->type == SDB_TYPE_INTEGER) {
 		ret = snprintf(buf, buflen, "%"PRIi64, datum->data.integer);
 	}
 	else if (datum->type == SDB_TYPE_DECIMAL) {
@@ -997,37 +1005,41 @@ sdb_data_format(const sdb_data_t *datum, char *buf, size_t buflen, int quoted)
 	}
 	else if (datum->type & SDB_TYPE_ARRAY) {
 		ret = 1;
-		buf[0] = '[';
+		if (buflen > 0)
+			buf[0] = '[';
 		for (i = 0; i < datum->data.array.length; ++i) {
 			sdb_data_t v = SDB_DATA_INIT;
-			int n;
-			if ((size_t)ret >= buflen - 1)
-				break;
+			size_t n;
 
 			if (ret > 1) {
-				buf[ret] = ',';
-				buf[ret + 1] = ' ';
+				if (buflen > ret + 1) {
+					buf[ret] = ',';
+					buf[ret + 1] = ' ';
+				}
 				ret += 2;
 			}
 
 			sdb_data_array_get(datum, i, &v);
-			n = sdb_data_format(&v, buf + ret, buflen - ret, quoted);
+			if (buflen > ret)
+				n = sdb_data_format(&v, buf + ret, buflen - ret, quoted);
+			else
+				n = sdb_data_format(&v, NULL, 0, quoted);
 			if (n > 0)
 				ret += n;
 			else
 				break;
 		}
-		if ((size_t)ret < buflen - 1) {
+		if (buflen > ret + 1) {
 			buf[ret] = ']';
 			buf[ret + 1] = '\0';
-			++ret;
 		}
+		++ret;
 	}
 
 	if (is_null) {
 		/* never quote NULL */
 		strncpy(buf, "NULL", buflen);
-		ret = (int)SDB_MIN(buflen, 4);
+		ret = 4;
 	}
 	else if (data) {
 		if (quoted == SDB_UNQUOTED)
@@ -1037,7 +1049,8 @@ sdb_data_format(const sdb_data_t *datum, char *buf, size_t buflen, int quoted)
 		else
 			ret = snprintf(buf, buflen, "\"%s\"", data);
 	}
-	buf[buflen - 1] = '\0';
+	if (buflen > 0)
+		buf[buflen - 1] = '\0';
 	return ret;
 } /* sdb_data_format */