X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=session_file.c;h=184dd37597c58af524bd4113b30909398947c1e5;hb=73017cf914b014ff3366de981035ca23ac72a0be;hp=c8939e5f300b6a4c4f885314f7afa1f8f87d56e4;hpb=f5a443f27ad0e99f8f0f93867a1f298d7a6a327a;p=libsigrok.git

diff --git a/session_file.c b/session_file.c
index c8939e5f..184dd375 100644
--- a/session_file.c
+++ b/session_file.c
@@ -24,12 +24,21 @@
 #include <zip.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 extern struct sr_session *session;
 extern struct sr_device_plugin session_driver;
 
+/**
+ * Load the session from the specified filename.
+ *
+ * @param filename The name of the session file to load. Must not be NULL.
+ *
+ * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments,
+ *         SR_ERR_MALLOC upon memory allocation errors, or SR_ERR upon
+ *         other errors.
+ */
 int sr_session_load(const char *filename)
 {
 	GKeyFile *kf;
@@ -43,37 +52,48 @@ int sr_session_load(const char *filename)
 	int ret, err, probenum, devcnt, i, j;
 	uint64_t tmp_u64, total_probes, enabled_probes, p;
 	char **sections, **keys, *metafile, *val, c;
+	char probename[SR_MAX_PROBENAME_LEN + 1];
+
+	if (!filename) {
+		sr_err("session file: %s: filename was NULL", __func__);
+		return SR_ERR_ARG;
+	}
 
 	if (!(archive = zip_open(filename, 0, &err))) {
-		g_debug("Failed to open session file: zip error %d", err);
+		sr_dbg("Failed to open session file: zip error %d", err);
 		return SR_ERR;
 	}
 
 	/* check "version" */
 	if (!(zf = zip_fopen(archive, "version", 0))) {
-		g_debug("Not a sigrok session file.");
+		sr_dbg("Not a sigrok session file.");
 		return SR_ERR;
 	}
 	ret = zip_fread(zf, &c, 1);
 	if (ret != 1 || c != '1') {
-		g_debug("Not a valid sigrok session file.");
+		sr_dbg("Not a valid sigrok session file.");
 		return SR_ERR;
 	}
 	zip_fclose(zf);
 
 	/* read "metadata" */
 	if (zip_stat(archive, "metadata", 0, &zs) == -1) {
-		g_debug("Not a valid sigrok session file.");
+		sr_dbg("Not a valid sigrok session file.");
 		return SR_ERR;
 	}
-	metafile = g_malloc(zs.size);
+
+	if (!(metafile = g_try_malloc(zs.size))) {
+		sr_err("session file: %s: metafile malloc failed", __func__);
+		return SR_ERR_MALLOC;
+	}
+
 	zf = zip_fopen_index(archive, zs.index, 0);
 	zip_fread(zf, metafile, zs.size);
 	zip_fclose(zf);
 
 	kf = g_key_file_new();
 	if (!g_key_file_load_from_data(kf, metafile, zs.size, 0, NULL)) {
-		g_debug("Failed to parse metadata.");
+		sr_dbg("Failed to parse metadata.");
 		return SR_ERR;
 	}
 
@@ -94,7 +114,7 @@ int sr_session_load(const char *filename)
 			for (j = 0; keys[j]; j++) {
 				val = g_key_file_get_string(kf, sections[i], keys[j], NULL);
 				if (!strcmp(keys[j], "capturefile")) {
-					device = sr_device_new(&session_driver, devcnt, 0);
+					device = sr_device_new(&session_driver, devcnt);
 					if (devcnt == 0)
 						/* first device, init the plugin */
 						device->plugin->init((char *)filename);
@@ -102,7 +122,7 @@ int sr_session_load(const char *filename)
 					device->plugin->set_configuration(devcnt, SR_HWCAP_CAPTUREFILE, val);
 					g_ptr_array_add(capturefiles, val);
 				} else if (!strcmp(keys[j], "samplerate")) {
-					tmp_u64 = sr_parse_sizestring(val);
+					sr_parse_sizestring(val, &tmp_u64);
 					device->plugin->set_configuration(devcnt, SR_HWCAP_SAMPLERATE, &tmp_u64);
 				} else if (!strcmp(keys[j], "unitsize")) {
 					tmp_u64 = strtoull(val, NULL, 10);
@@ -110,8 +130,10 @@ int sr_session_load(const char *filename)
 				} else if (!strcmp(keys[j], "total probes")) {
 					total_probes = strtoull(val, NULL, 10);
 					device->plugin->set_configuration(devcnt, SR_HWCAP_CAPTURE_NUM_PROBES, &total_probes);
-					for (p = 1; p <= total_probes; p++)
-						sr_device_probe_add(device, NULL);
+					for (p = 0; p < total_probes; p++) {
+						snprintf(probename, SR_MAX_PROBENAME_LEN, "%" PRIu64, p);
+						sr_device_probe_add(device, probename);
+					}
 				} else if (!strncmp(keys[j], "probe", 5)) {
 					if (!device)
 						continue;
@@ -136,6 +158,15 @@ int sr_session_load(const char *filename)
 	return SR_OK;
 }
 
+/**
+ * Save the current session to the specified file.
+ *
+ * @param filename The name of the file where to save the current session.
+ *                 Must not be NULL.
+ *
+ * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or SR_ERR
+ *         upon other errors.
+ */
 int sr_session_save(const char *filename)
 {
 	GSList *l, *p, *d;
@@ -149,6 +180,11 @@ int sr_session_save(const char *filename)
 	uint64_t samplerate;
 	char version[1], rawname[16], metafile[32], *buf, *s;
 
+	if (!filename) {
+		sr_err("session file: %s: filename was NULL", __func__);
+		return SR_ERR_ARG;
+	}
+
 	/* Quietly delete it first, libzip wants replace ops otherwise. */
 	unlink(filename);
 	if (!(zipfile = zip_open(filename, ZIP_CREATE, &error)))
@@ -159,8 +195,8 @@ int sr_session_save(const char *filename)
 	if (!(versrc = zip_source_buffer(zipfile, version, 1, 0)))
 		return SR_ERR;
 	if (zip_add(zipfile, "version", versrc) == -1) {
-		g_message("error saving version into zipfile: %s",
-			  zip_strerror(zipfile));
+		sr_info("error saving version into zipfile: %s",
+			zip_strerror(zipfile));
 		return SR_ERR;
 	}
 
@@ -234,7 +270,7 @@ int sr_session_save(const char *filename)
 		return SR_ERR;
 
 	if ((ret = zip_close(zipfile)) == -1) {
-		g_message("error saving zipfile: %s", zip_strerror(zipfile));
+		sr_info("error saving zipfile: %s", zip_strerror(zipfile));
 		return SR_ERR;
 	}