X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore_json.c;h=a2c117b1f10d07308e7db9afd698c32933342e49;hp=878cc4fe265886653c754a60a83ef23889af1668;hb=79debed9dacc5d48386124a1ee9a3f7be655fdf6;hpb=a873701765e00228463e06795bdde21274e8fa74

diff --git a/src/core/store_json.c b/src/core/store_json.c
index 878cc4f..a2c117b 100644
--- a/src/core/store_json.c
+++ b/src/core/store_json.c
@@ -1,6 +1,6 @@
 /*
  * SysDB - src/core/store_json.c
- * Copyright (C) 2013-2014 Sebastian 'tokkee' Harl <sh@tokkee.org>
+ * Copyright (C) 2013-2015 Sebastian 'tokkee' Harl <sh@tokkee.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,9 +58,6 @@ struct sdb_store_json_formatter {
 	int context[8];
 	size_t current;
 
-	/* The current host context when processing non-host objects */
-	sdb_store_obj_t *current_host;
-
 	int type;
 	int flags;
 };
@@ -83,8 +80,6 @@ formatter_init(sdb_object_t *obj, va_list ap)
 
 	f->context[0] = 0;
 	f->current = 0;
-
-	f->current_host = NULL;
 	return 0;
 } /* formatter_init */
 
@@ -125,6 +120,64 @@ escape_string(const char *src, char *dest)
 	dest[i + 1] = '\0';
 } /* escape_string */
 
+/* handle_new_object takes care of all maintenance logic related to adding a
+ * new object. That is, it manages context information and emit the prefix and
+ * suffix of an object. */
+static int
+handle_new_object(sdb_store_json_formatter_t *f, sdb_store_obj_t *obj)
+{
+	/* first top-level object */
+	if (! f->context[0]) {
+		if ((obj->type != f->type) && (obj->type != SDB_HOST)) {
+			sdb_log(SDB_LOG_ERR, "store: Unexpected object of type %s "
+					"as the first element during %s JSON serialization",
+					SDB_STORE_TYPE_TO_NAME(obj->type),
+					SDB_STORE_TYPE_TO_NAME(f->type));
+			return -1;
+		}
+		if (f->flags & SDB_WANT_ARRAY)
+			sdb_strbuf_append(f->buf, "[");
+		assert(f->current == 0);
+		f->context[f->current] = obj->type;
+		return 0;
+	}
+
+	if ((f->context[f->current] != SDB_HOST)
+			&& (obj->type != SDB_ATTRIBUTE)) {
+		/* new entry of the same type or a parent object;
+		 * rewind to the right state */
+		while ((f->current > 0)
+				&& (f->context[f->current] != obj->type)) {
+			sdb_strbuf_append(f->buf, "}]");
+			--f->current;
+		}
+	}
+
+	if (obj->type == f->context[f->current]) {
+		/* new entry of the same type */
+		sdb_strbuf_append(f->buf, "},");
+	}
+	else if ((f->context[f->current] == SDB_HOST)
+			|| (obj->type == SDB_ATTRIBUTE)) {
+		assert(obj->type != SDB_HOST);
+		/* all object types may be children of a host;
+		 * attributes may be children of any type */
+		sdb_strbuf_append(f->buf, ", \"%ss\": [",
+				SDB_STORE_TYPE_TO_NAME(obj->type));
+		++f->current;
+	}
+	else {
+		sdb_log(SDB_LOG_ERR, "store: Unexpected object of type %s "
+				"on level %zu during JSON serialization",
+				SDB_STORE_TYPE_TO_NAME(obj->type), f->current);
+		return -1;
+	}
+
+	assert(f->current < SDB_STATIC_ARRAY_LEN(f->context));
+	f->context[f->current] = obj->type;
+	return 0;
+} /* handle_new_object */
+
 static int
 json_emit(sdb_store_json_formatter_t *f, sdb_store_obj_t *obj)
 {
@@ -135,16 +188,7 @@ json_emit(sdb_store_json_formatter_t *f, sdb_store_obj_t *obj)
 
 	assert(f && obj);
 
-	if ((f->type != SDB_HOST) && (f->type == obj->type)) {
-		/* create the host for the current entry first */
-		assert(obj->parent && (obj->parent->type == SDB_HOST));
-		if (f->current_host != obj->parent) {
-			json_emit(f, obj->parent);
-			sdb_strbuf_append(f->buf, ", \"%ss\": [",
-					SDB_STORE_TYPE_TO_NAME(obj->type));
-			f->current_host = obj->parent;
-		}
-	}
+	handle_new_object(f, obj);
 
 	escape_string(SDB_OBJ(obj)->name, name);
 	sdb_strbuf_append(f->buf, "{\"name\": %s, ", name);
@@ -210,68 +254,7 @@ sdb_store_json_emit(sdb_store_json_formatter_t *f, sdb_store_obj_t *obj)
 {
 	if ((! f) || (! obj))
 		return -1;
-
-	if ((f->type != SDB_HOST) && (obj->type == SDB_HOST)) {
-		sdb_log(SDB_LOG_ERR, "store: Unexpected object of type host "
-				"during %s JSON serialization",
-				SDB_STORE_TYPE_TO_NAME(f->type));
-		return -1;
-	}
-
-	/* first top-level object */
-	if (! f->context[0]) {
-		if (obj->type != f->type) {
-			sdb_log(SDB_LOG_ERR, "store: Unexpected object of type %s "
-					"as the first element during %s JSON serialization",
-					SDB_STORE_TYPE_TO_NAME(obj->type),
-					SDB_STORE_TYPE_TO_NAME(f->type));
-			return -1;
-		}
-		if (f->flags & SDB_WANT_ARRAY)
-			sdb_strbuf_append(f->buf, "[");
-		assert(f->current == 0);
-		f->context[0] = obj->type;
-		return json_emit(f, obj);
-	}
-
-	if ((f->current >= 1) && (obj->type != SDB_ATTRIBUTE)) {
-		/* new entry of a previous type or a new type on the same level;
-		 * rewind to the right state */
-		while (f->current > 0) {
-			if (f->context[f->current] == obj->type)
-				break;
-			sdb_strbuf_append(f->buf, "}]");
-			--f->current;
-		}
-	}
-	if ((obj->type == f->type) && (f->type != SDB_HOST))
-		if (obj->parent != f->current_host)
-			sdb_strbuf_append(f->buf, "}]");
-
-	if (obj->type == f->context[f->current]) {
-		/* new entry of the same type */
-		sdb_strbuf_append(f->buf, "},");
-	}
-	else if ((f->context[f->current] == SDB_HOST)
-			|| (obj->type == SDB_ATTRIBUTE)) {
-		assert(obj->type != SDB_HOST);
-		/* all object types may be children of a host;
-		 * attributes may be children of any type */
-		sdb_strbuf_append(f->buf, ", \"%ss\": [",
-				SDB_STORE_TYPE_TO_NAME(obj->type));
-		++f->current;
-	}
-	else {
-		sdb_log(SDB_LOG_ERR, "store: Unexpected object of type %s "
-				"on level %zu during JSON serialization",
-				SDB_STORE_TYPE_TO_NAME(obj->type), f->current);
-		return -1;
-	}
-
-	json_emit(f, obj);
-	assert(f->current < SDB_STATIC_ARRAY_LEN(f->context));
-	f->context[f->current] = obj->type;
-	return 0;
+	return json_emit(f, obj);
 } /* sdb_store_json_emit */
 
 int
@@ -339,12 +322,7 @@ sdb_store_json_finish(sdb_store_json_formatter_t *f)
 		sdb_strbuf_append(f->buf, "}]");
 		--f->current;
 	}
-	if (f->context[0] != SDB_HOST) {
-		assert(f->type != SDB_HOST);
-		sdb_strbuf_append(f->buf, "}]}");
-	}
-	else
-		sdb_strbuf_append(f->buf, "}");
+	sdb_strbuf_append(f->buf, "}");
 
 	if (f->flags & SDB_WANT_ARRAY)
 		sdb_strbuf_append(f->buf, "]");