Consistently use the _WIN32 #define.

[libsigrok.git] / src / session.c

diff --git a/src/session.c b/src/session.c
index 1843fd17b9f58bf248a58a66b6852f960d5215af..16fdfffa4bf945872bb3f8004346f76018cae4a6 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -365,7 +365,7 @@ SR_API int sr_session_dev_add(struct sr_session *session,
                               sr_strerror(ret));
                        return ret;
                }
-               if ((ret = sdi->driver->dev_acquisition_start(sdi)) != SR_OK) {
+               if ((ret = sr_dev_acquisition_start(sdi)) != SR_OK) {
                        sr_err("Failed to start acquisition of device in "
                               "running session (%s)", sr_strerror(ret));
                        return ret;
@@ -816,7 +816,7 @@ SR_API int sr_session_start(struct sr_session *session)
                        ret = SR_ERR;
                        break;
                }
-               ret = sdi->driver->dev_acquisition_start(sdi);
+               ret = sr_dev_acquisition_start(sdi);
                if (ret != SR_OK) {
                        sr_err("Could not start %s device %s acquisition.",
                                sdi->driver->name, sdi->connection_id);
@@ -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);
@@ -1484,8 +1484,15 @@ SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
        case SR_DF_LOGIC:
                logic = packet->payload;
                logic_copy = g_malloc(sizeof(*logic_copy));
+               if (!logic_copy)
+                       return SR_ERR;
                logic_copy->length = logic->length;
                logic_copy->unitsize = logic->unitsize;
+               logic_copy->data = g_malloc(logic->length * logic->unitsize);
+               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;