BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sr_packet_{copy,free} API calls public. 

This fixes bug #1277.
This commit is contained in:
Uwe Hermann 2018-09-18 23:39:56 +02:00
parent 3d11872282
commit 3bae09ab9f
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libsigrok/proto.h
View File

@ -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_API int sr_session_stopped_callback_set(struct sr_session *session,
sr_session_stopped_callback cb, void *cb_data); 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 ---------------------------------------------------------*/ /*--- input/input.c ---------------------------------------------------------*/
SR_API const struct sr_input_module **sr_input_list(void); SR_API const struct sr_input_module **sr_input_list(void);

3
src/libsigrok-internal.h
View File

@ -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 int sr_sessionfile_check(const char *filename);
SR_PRIV struct sr_dev_inst *sr_session_prepare_sdi(const char *filename, SR_PRIV struct sr_dev_inst *sr_session_prepare_sdi(const char *filename,
struct sr_session **session); 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 --------------------------------------------------------*/ /*--- session_file.c --------------------------------------------------------*/

6
src/session.c
View File

@ -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))); g_memdup(src, sizeof(struct sr_config)));
} }
/** @private */ SR_API int sr_packet_copy(const struct sr_datafeed_packet *packet,
SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
struct sr_datafeed_packet **copy) struct sr_datafeed_packet **copy)
{ {
const struct sr_datafeed_meta *meta; 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; 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_meta *meta;
const struct sr_datafeed_logic *logic; 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); sr_err("Unknown packet type %d", packet->type);
} }
g_free(packet); g_free(packet);
} }
/** @} */ /** @} */