X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_file.c;h=cb99bf27ad3f4367fb97529225db63a787fca405;hb=133a37bfba1a7e1423716b2b872d3bb82a2e64d9;hp=0e3c56bec13be086a4cf7ce10f725c17363773a2;hpb=b53738baf76219237e0a6629905981d7a1f2508e;p=libsigrok.git

diff --git a/session_file.c b/session_file.c
index 0e3c56be..cb99bf27 100644
--- a/session_file.c
+++ b/session_file.c
@@ -17,20 +17,29 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <zip.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "config.h"
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 extern struct sr_session *session;
 extern struct sr_device_plugin session_driver;
 
-int sr_session_load(const char *filename)
+/**
+ * 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.
+ */
+SR_API int sr_session_load(const char *filename)
 {
 	GKeyFile *kf;
 	GPtrArray *capturefiles;
@@ -43,6 +52,12 @@ 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))) {
 		sr_dbg("Failed to open session file: zip error %d", err);
@@ -99,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);
@@ -107,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);
@@ -115,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;
@@ -141,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;
@@ -154,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)))
@@ -199,7 +230,7 @@ int sr_session_save(const char *filename)
 						device->plugin_index, SR_DI_CUR_SAMPLERATE));
 				s = sr_samplerate_string(samplerate);
 				fprintf(meta, "samplerate = %s\n", s);
-				free(s);
+				g_free(s);
 			}
 			probecnt = 1;
 			for (p = device->probes; p; p = p->next) {
@@ -214,8 +245,14 @@ int sr_session_save(const char *filename)
 			}
 
 			/* dump datastore into logic-n */
-			buf = malloc(ds->num_units * ds->ds_unitsize +
+			buf = g_try_malloc(ds->num_units * ds->ds_unitsize +
 				   DATASTORE_CHUNKSIZE);
+			if (!buf) {
+				sr_err("session file: %s: buf malloc failed",
+				       __func__);
+				return SR_ERR_MALLOC;
+			}
+
 			bufcnt = 0;
 			for (d = ds->chunklist; d; d = d->next) {
 				memcpy(buf + bufcnt, d->data,