sr: Random cosmetics, fix/amend Doxygen comments.

[libsigrok.git] / session_file.c

diff --git a/session_file.c b/session_file.c
index 08de48c2001d996b5e1295430fcd28b9e8475ed1..007e089c52ecebec27a32dfa34d8036054e60b62 100644 (file)
--- a/session_file.c
+++ b/session_file.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 #include "sigrok-internal.h"
 
 extern struct sr_session *session;
-extern struct sr_device_plugin session_driver;
+extern SR_PRIV struct sr_device_plugin session_driver;
 
 /**
  * Load the session from the specified filename.
@@ -60,25 +60,26 @@ SR_API int sr_session_load(const char *filename)
        }
 
        if (!(archive = zip_open(filename, 0, &err))) {
-               sr_dbg("Failed to open session file: zip error %d", err);
+               sr_dbg("session file: Failed to open session file: zip "
+                      "error %d", err);
                return SR_ERR;
        }
 
        /* check "version" */
        if (!(zf = zip_fopen(archive, "version", 0))) {
-               sr_dbg("Not a sigrok session file.");
+               sr_dbg("session file: Not a sigrok session file.");
                return SR_ERR;
        }
        ret = zip_fread(zf, &c, 1);
        if (ret != 1 || c != '1') {
-               sr_dbg("Not a valid sigrok session file.");
+               sr_dbg("session file: Not a valid sigrok session file.");
                return SR_ERR;
        }
        zip_fclose(zf);
 
        /* read "metadata" */
        if (zip_stat(archive, "metadata", 0, &zs) == -1) {
-               sr_dbg("Not a valid sigrok session file.");
+               sr_dbg("session file: Not a valid sigrok session file.");
                return SR_ERR;
        }
 
@@ -93,7 +94,7 @@ SR_API int sr_session_load(const char *filename)
 
        kf = g_key_file_new();
        if (!g_key_file_load_from_data(kf, metafile, zs.size, 0, NULL)) {
-               sr_dbg("Failed to parse metadata.");
+               sr_dbg("session file: Failed to parse metadata.");
                return SR_ERR;
        }
 
@@ -114,7 +115,7 @@ SR_API 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);
+                                       device = sr_dev_new(&session_driver, devcnt);
                                        if (devcnt == 0)
                                                /* first device, init the plugin */
                                                device->plugin->init((char *)filename);
@@ -132,17 +133,17 @@ SR_API int sr_session_load(const char *filename)
                                        device->plugin->set_configuration(devcnt, SR_HWCAP_CAPTURE_NUM_PROBES, &total_probes);
                                        for (p = 0; p < total_probes; p++) {
                                                snprintf(probename, SR_MAX_PROBENAME_LEN, "%" PRIu64, p);
-                                               sr_device_probe_add(device, probename);
+                                               sr_dev_probe_add(device, probename);
                                        }
                                } else if (!strncmp(keys[j], "probe", 5)) {
                                        if (!device)
                                                continue;
                                        enabled_probes++;
                                        tmp_u64 = strtoul(keys[j]+5, NULL, 10);
-                                       sr_device_probe_name(device, tmp_u64, val);
+                                       sr_dev_probe_name(device, tmp_u64, val);
                                } else if (!strncmp(keys[j], "trigger", 7)) {
                                        probenum = strtoul(keys[j]+7, NULL, 10);
-                                       sr_device_trigger_set(device, probenum, val);
+                                       sr_dev_trigger_set(device, probenum, val);
                                }
                        }
                        g_strfreev(keys);
@@ -195,7 +196,7 @@ 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) {
-               sr_info("error saving version into zipfile: %s",
+               sr_info("session file: error saving version into zipfile: %s",
                        zip_strerror(zipfile));
                return SR_ERR;
        }
@@ -225,12 +226,12 @@ int sr_session_save(const char *filename)
                        fprintf(meta, "capturefile = logic-%d\n", devcnt);
                        fprintf(meta, "unitsize = %d\n", ds->ds_unitsize);
                        fprintf(meta, "total probes = %d\n", g_slist_length(device->probes));
-                       if (sr_device_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
+                       if (sr_dev_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
                                samplerate = *((uint64_t *) device->plugin->get_device_info(
                                                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) {
@@ -245,8 +246,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,
@@ -270,7 +277,8 @@ int sr_session_save(const char *filename)
                return SR_ERR;
 
        if ((ret = zip_close(zipfile)) == -1) {
-               sr_info("error saving zipfile: %s", zip_strerror(zipfile));
+               sr_info("session file: error saving zipfile: %s",
+                       zip_strerror(zipfile));
                return SR_ERR;
        }