scpi-pps: Add a missing "break" in config_get().

[libsigrok.git] / src / session.c

diff --git a/src/session.c b/src/session.c
index 0620b222b2cafa37b596d9011be2964d1320887b..b3fdfb54a2451b0ac506b0f82b452fda30ad6807 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -1294,7 +1294,7 @@ SR_PRIV int sr_session_source_add_channel(struct sr_session *session,
        /* We should be using g_io_create_watch(), but can't without
         * changing the driver API, as the callback signature is different.
         */
-#ifdef G_OS_WIN32
+#ifdef _WIN32
        g_io_channel_win32_make_pollfd(channel, events, &pollfd);
 #else
        pollfd.fd = g_io_channel_unix_get_fd(channel);
@@ -1450,8 +1450,7 @@ static void copy_src(struct sr_config *src, struct sr_datafeed_meta *meta_copy)
                                           g_memdup(src, sizeof(struct sr_config)));
 }
 
-/** @private */
-SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
+SR_API int sr_packet_copy(const struct sr_datafeed_packet *packet,
                struct sr_datafeed_packet **copy)
 {
        const struct sr_datafeed_meta *meta;
@@ -1489,8 +1488,10 @@ SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
                logic_copy->length = logic->length;
                logic_copy->unitsize = logic->unitsize;
                logic_copy->data = g_malloc(logic->length * logic->unitsize);
-               if (!logic_copy->data)
+               if (!logic_copy->data) {
+                       g_free(logic_copy);
                        return SR_ERR;
+               }
                memcpy(logic_copy->data, logic->data, logic->length * logic->unitsize);
                (*copy)->payload = logic_copy;
                break;
@@ -1520,7 +1521,7 @@ SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
        return SR_OK;
 }
 
-void sr_packet_free(struct sr_datafeed_packet *packet)
+SR_API void sr_packet_free(struct sr_datafeed_packet *packet)
 {
        const struct sr_datafeed_meta *meta;
        const struct sr_datafeed_logic *logic;
@@ -1565,7 +1566,6 @@ void sr_packet_free(struct sr_datafeed_packet *packet)
                sr_err("Unknown packet type %d", packet->type);
        }
        g_free(packet);
-
 }
 
 /** @} */