Osmocom Open Build Service

commit_440a9dee42e42679055f803751d4b542483f9921.txt Deleted

commit_88982003f96d31ff28666b8016826b760614146e.txt Added

osmo-uecups_0.3.0.4.440a.dsc -> osmo-uecups_0.3.0.5.8898.dsc Changed

osmo-uecups_0.3.0.4.440a.tar.xz/.tarball-version -> osmo-uecups_0.3.0.5.8898.tar.xz/.tarball-version Changed

osmo-uecups_0.3.0.4.440a.tar.xz/daemon/cups_client.c -> osmo-uecups_0.3.0.5.8898.tar.xz/daemon/cups_client.c Changed

@@ -85,37 +85,43 @@
 	talloc_free(sproc);
 }
 
-/* Send JSON to a given client/connection */
-int cups_client_tx_json(struct cups_client *cc, json_t *jtx)
+static int cups_client_tx_json_str(struct cups_client *cc, const char *json_str, unsigned int json_strlen)
 {
 	struct msgb *msg = msgb_alloc(CUPS_MSGB_SIZE, "Tx JSON");
-	char *json_str = json_dumps(jtx, JSON_SORT_KEYS);
 	char *out;
-	int json_strlen;
-
-	json_decref(jtx);
-	if (!json_str) {
-		LOGCC(cc, LOGL_ERROR, "Error encoding JSON\n");
-		return 0;
-	}
-	json_strlen = strlen(json_str);
-
 	LOGCC(cc, LOGL_DEBUG, "JSON Tx '%s'\n", json_str);
 
 	if (json_strlen > msgb_tailroom(msg)) {
 		LOGCC(cc, LOGL_ERROR, "Not enough room for JSON in msgb\n");
-		free(json_str);
 		return 0;
 	}
 
 	out = (char *)msgb_put(msg, json_strlen);
 	memcpy(out, json_str, json_strlen);
-	free(json_str);
 	osmo_stream_srv_send(cc->srv, msg);
 
 	return 0;
 }
 
+/* Send JSON to a given client/connection */
+int cups_client_tx_json(struct cups_client *cc, json_t *jtx)
+{
+	char *json_str = json_dumps(jtx, JSON_SORT_KEYS);
+	unsigned int json_strlen;
+	int rc;
+
+	json_decref(jtx);
+	if (!json_str) {
+		LOGCC(cc, LOGL_ERROR, "Error encoding JSON\n");
+		return 0;
+	}
+	json_strlen = strlen(json_str);
+
+	rc = cups_client_tx_json_str(cc, json_str, json_strlen);
+	free(json_str);
+	return rc;
+}
+
 json_t *gen_uecups_result(const char *name, const char *res)
 {
 	json_t *jres = json_object();

osmo-uecups_0.3.0.4.440a.tar.xz/debian/changelog -> osmo-uecups_0.3.0.5.8898.tar.xz/debian/changelog Changed

Changes of Revision 27