Add sr_ prefix for 'struct session'.

diff --git a/session.c b/session.c
index 7732629131c1a0f4957ef71546a643c571c6a9cd..e4f3921b79528c3bc8194657919a5e4e98ab12f8 100644 (file)
--- a/session.c
+++ b/session.c
@@ -37,16 +37,16 @@ struct source {
 };
 
 /* There can only be one session at a time. */
-struct session *session;
+struct sr_session *session;
 int num_sources = 0;
 
 struct source *sources = NULL;
 int source_timeout = -1;
 
 
-struct session *session_new(void)
+struct sr_session *session_new(void)
 {
-       session = calloc(1, sizeof(struct session));
+       session = calloc(1, sizeof(struct sr_session));
 
        return session;
 }

diff --git a/session_file.c b/session_file.c
index 2a727c86f7d4c62def8428dcb53f2800a87aa702..bd3548ab4f7799a78a9c7b0ccee1e98704c3ef02 100644 (file)
--- a/session_file.c
+++ b/session_file.c
@@ -26,7 +26,7 @@
 #include <glib/gstdio.h>
 #include <sigrok.h>
 
-extern struct session *session;
+extern struct sr_session *session;
 extern struct sr_device_plugin session_driver;
 
 
@@ -37,7 +37,7 @@ int session_load(const char *filename)
        struct zip *archive;
        struct zip_file *zf;
        struct zip_stat zs;
-       struct session *session;
+       struct sr_session *session;
        struct sr_device *device;
        struct sr_probe *probe;
        int ret, err, probenum, devcnt, i, j;

diff --git a/sigrok-proto.h b/sigrok-proto.h
index c0d09da5b3858800b8507cce209fbd34a1ba8031..8dfe2db149daea8ce46163fd0e0e3c6585239f20 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -98,7 +98,7 @@ typedef void (*datafeed_callback) (struct sr_device *device,
 
 /* Session setup */
 int session_load(const char *filename);
-struct session *session_new(void);
+struct sr_session *session_new(void);
 void session_destroy(void);
 void session_device_clear(void);
 int session_device_add(struct sr_device *device);

diff --git a/sigrok.h b/sigrok.h
index 9518041ce32fd0bce7d05a12050fd52b5d4e04b0..9a5d0cbeade3bacab1e368481565652ca9f2af76 100644 (file)
--- a/sigrok.h
+++ b/sigrok.h
@@ -340,7 +340,7 @@ struct sr_device_plugin {
        void (*stop_acquisition) (int device_index, gpointer session_device_id);
 };
 
-struct session {
+struct sr_session {
        /* List of struct sr_device* */
        GSList *devices;
        /* List of struct analyzer* */