X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_file.c;h=c8939e5f300b6a4c4f885314f7afa1f8f87d56e4;hb=f7d2982d42e876d8814cba203570a45284c79658;hp=015927d2a2d00c6289276ae427f8f0d5faa2a14b;hpb=7d6588743503514c9de5c4fc8a511e9b0bdad7e6;p=libsigrok.git

diff --git a/session_file.c b/session_file.c
index 015927d2..c8939e5f 100644
--- 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>
+#include <sigrok-internal.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);
@@ -94,11 +94,11 @@ int 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 = device_new(&session_driver, devcnt, 0);
+					device = sr_device_new(&session_driver, devcnt, 0);
 					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")) {
@@ -111,16 +111,16 @@ int session_load(const char *filename)
 					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++)
-						device_probe_add(device, NULL);
+						sr_device_probe_add(device, NULL);
 				} else if (!strncmp(keys[j], "probe", 5)) {
 					if (!device)
 						continue;
 					enabled_probes++;
 					tmp_u64 = strtoul(keys[j]+5, NULL, 10);
-					device_probe_name(device, tmp_u64, val);
+					sr_device_probe_name(device, tmp_u64, val);
 				} else if (!strncmp(keys[j], "trigger", 7)) {
 					probenum = strtoul(keys[j]+7, NULL, 10);
-					device_trigger_set(device, probenum, val);
+					sr_device_trigger_set(device, probenum, val);
 				}
 			}
 			g_strfreev(keys);
@@ -136,29 +136,23 @@ int session_load(const char *filename)
 	return SR_OK;
 }
 
-int session_save(char *filename)
+int sr_session_save(const char *filename)
 {
 	GSList *l, *p, *d;
 	FILE *meta;
 	struct sr_device *device;
-	struct probe *probe;
-	struct datastore *ds;
+	struct sr_probe *probe;
+	struct sr_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 */
@@ -195,7 +189,7 @@ int session_save(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 (device_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
+			if (sr_device_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);
@@ -248,4 +242,3 @@ int session_save(char *filename)
 
 	return SR_OK;
 }
-