Move most contrib/ stuff to libsigrok.

[libsigrok.git] / session_file.c

diff --git a/session_file.c b/session_file.c
index c8939e5f300b6a4c4f885314f7afa1f8f87d56e4..b739f9089de5737a795eff5e690c406e082dbf87 100644 (file)
--- a/session_file.c
+++ b/session_file.c
@@ -24,8 +24,8 @@
 #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;
@@ -43,37 +43,43 @@ 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 (!(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 +100,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 +108,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 +116,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;
@@ -159,8 +167,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 +242,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;
        }