Add sr_ prefix to 'struct samplerates'.

[libsigrok.git] / session_file.c

diff --git a/session_file.c b/session_file.c
index 015927d2a2d00c6289276ae427f8f0d5faa2a14b..aa7a8b657ccfc2a20f1b6ef6c77db430914463f7 100644 (file)
--- a/session_file.c
+++ b/session_file.c
@@ -17,29 +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 <config.h>
 
-
-extern struct session *session;
+extern struct sr_session *session;
 extern struct sr_device_plugin session_driver;
 
 
-int session_load(const char *filename)
+int sr_session_load(const char *filename)
 {
        GKeyFile *kf;
        GPtrArray *capturefiles;
        struct zip *archive;
        struct zip_file *zf;
        struct zip_stat zs;
-       struct session *session;
+       struct sr_session *session;
        struct sr_device *device;
-       struct probe *probe;
+       struct sr_probe *probe;
        int ret, err, probenum, devcnt, i, j;
        uint64_t tmp_u64, total_probes, enabled_probes, p;
        char **sections, **keys, *metafile, *val, c;
@@ -77,7 +77,7 @@ int session_load(const char *filename)
                return SR_ERR;
        }
 
-       session = session_new();
+       session = sr_session_new();
 
        devcnt = 0;
        capturefiles = g_ptr_array_new_with_free_func(g_free);
@@ -98,7 +98,7 @@ int session_load(const char *filename)
                                        if (devcnt == 0)
                                                /* first device, init the plugin */
                                                device->plugin->init((char *)filename);
-                                       session_device_add(device);
+                                       sr_session_device_add(device);
                                        device->plugin->set_configuration(devcnt, SR_HWCAP_CAPTUREFILE, val);
                                        g_ptr_array_add(capturefiles, val);
                                } else if (!strcmp(keys[j], "samplerate")) {
@@ -136,29 +136,23 @@ int session_load(const char *filename)
        return SR_OK;
 }
 
-int session_save(char *filename)
+int sr_session_save(char *filename)
 {
        GSList *l, *p, *d;
        FILE *meta;
        struct sr_device *device;
-       struct probe *probe;
+       struct sr_probe *probe;
        struct datastore *ds;
        struct zip *zipfile;
        struct zip_source *versrc, *metasrc, *logicsrc;
        int bufcnt, devcnt, tmpfile, ret, error, probecnt;
        uint64_t samplerate;
-       char version[1], rawname[16], metafile[32], *newfn, *buf, *s;
-
-       newfn = g_malloc(strlen(filename) + 10);
-       strcpy(newfn, filename);
-       if (strstr(filename, ".sigrok") != filename+strlen(filename)-7)
-               strcat(newfn, ".sigrok");
+       char version[1], rawname[16], metafile[32], *buf, *s;
 
        /* Quietly delete it first, libzip wants replace ops otherwise. */
-       unlink(newfn);
-       if (!(zipfile = zip_open(newfn, ZIP_CREATE, &error)))
+       unlink(filename);
+       if (!(zipfile = zip_open(filename, ZIP_CREATE, &error)))
                return SR_ERR;
-       g_free(newfn);
 
        /* "version" */
        version[0] = '1';
@@ -175,7 +169,7 @@ int session_save(char *filename)
        if ((tmpfile = g_mkstemp(metafile)) == -1)
                return SR_ERR;
        close(tmpfile);
-       meta = fopen(metafile, "wb");
+       meta = g_fopen(metafile, "wb");
        fprintf(meta, "[global]\n");
        fprintf(meta, "sigrok version = %s\n", PACKAGE_VERSION);
        /* TODO: save protocol decoders used */