sr: moved sigrok.h so libsigrok/libsigrok.h

[libsigrok.git] / session_file.c

diff --git a/session_file.c b/session_file.c
index ca639cd555347354b17587897ee37d45171e17ac..6b7781626c381b01f9da54a3ab12bf4ac091d790 100644 (file)
--- a/session_file.c
+++ b/session_file.c
@@ -24,8 +24,8 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include "config.h"
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 extern struct sr_session *session;
 extern SR_PRIV struct sr_dev_driver session_driver;
@@ -48,7 +48,7 @@ SR_API int sr_session_load(const char *filename)
        struct zip_stat zs;
        struct sr_dev *dev;
        struct sr_probe *probe;
-       int ret, err, probenum, devcnt, i, j;
+       int ret, 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];
@@ -58,9 +58,9 @@ SR_API int sr_session_load(const char *filename)
                return SR_ERR_ARG;
        }
 
-       if (!(archive = zip_open(filename, 0, &err))) {
+       if (!(archive = zip_open(filename, 0, &ret))) {
                sr_dbg("session file: Failed to open session file: zip "
-                      "error %d", err);
+                      "error %d", ret);
                return SR_ERR;
        }
 
@@ -139,7 +139,7 @@ SR_API int sr_session_load(const char *filename)
                                                continue;
                                        enabled_probes++;
                                        tmp_u64 = strtoul(keys[j]+5, NULL, 10);
-                                       sr_dev_probe_name(dev, tmp_u64, val);
+                                       sr_dev_probe_name_set(dev, tmp_u64, val);
                                } else if (!strncmp(keys[j], "trigger", 7)) {
                                        probenum = strtoul(keys[j]+7, NULL, 10);
                                        sr_dev_trigger_set(dev, probenum, val);
@@ -176,7 +176,7 @@ int sr_session_save(const char *filename)
        struct sr_datastore *ds;
        struct zip *zipfile;
        struct zip_source *versrc, *metasrc, *logicsrc;
-       int bufcnt, devcnt, tmpfile, ret, error, probecnt;
+       int bufcnt, devcnt, tmpfile, ret, probecnt;
        uint64_t samplerate;
        char version[1], rawname[16], metafile[32], *buf, *s;
 
@@ -187,7 +187,7 @@ int sr_session_save(const char *filename)
 
        /* Quietly delete it first, libzip wants replace ops otherwise. */
        unlink(filename);
-       if (!(zipfile = zip_open(filename, ZIP_CREATE, &error)))
+       if (!(zipfile = zip_open(filename, ZIP_CREATE, &ret)))
                return SR_ERR;
 
        /* "version" */