Make sr_packet_{copy,free} API calls public.

This fixes bug #1277.

diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h
index b832cea269197ce753adf4b954afa286ef1429d1..41d9cfcc672931f62bac06a648d24a171bcceb76 100644 (file)
--- a/include/libsigrok/proto.h
+++ b/include/libsigrok/proto.h
@@ -154,6 +154,10 @@ SR_API int sr_session_is_running(struct sr_session *session);
 SR_API int sr_session_stopped_callback_set(struct sr_session *session,
                sr_session_stopped_callback cb, void *cb_data);
 
+SR_API int sr_packet_copy(const struct sr_datafeed_packet *packet,
+               struct sr_datafeed_packet **copy);
+SR_API void sr_packet_free(struct sr_datafeed_packet *packet);
+
 /*--- input/input.c ---------------------------------------------------------*/
 
 SR_API const struct sr_input_module **sr_input_list(void);

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 50f83bd1b54e267b752bdc18a53c3835d4de7a19..a681abae43def87dc8919ca2b79c9c05d618d166 100644 (file)
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -909,9 +909,6 @@ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
 SR_PRIV int sr_sessionfile_check(const char *filename);
 SR_PRIV struct sr_dev_inst *sr_session_prepare_sdi(const char *filename,
                struct sr_session **session);
-SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
-               struct sr_datafeed_packet **copy);
-SR_PRIV void sr_packet_free(struct sr_datafeed_packet *packet);
 
 /*--- session_file.c --------------------------------------------------------*/
 

diff --git a/src/session.c b/src/session.c
index 16fdfffa4bf945872bb3f8004346f76018cae4a6..b3fdfb54a2451b0ac506b0f82b452fda30ad6807 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -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;
@@ -1522,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;
@@ -1567,7 +1566,6 @@ void sr_packet_free(struct sr_datafeed_packet *packet)
                sr_err("Unknown packet type %d", packet->type);
        }
        g_free(packet);
-
 }
 
 /** @} */