summaryrefslogtreecommitdiff
path: root/controller.c
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2012-02-29 22:32:34 +0100
committerUwe Hermann <uwe@hermann-uwe.de>2012-03-02 02:25:42 +0100
commit41a5d9624022856f4ef357c1fdce041a9774a99c (patch)
treee369327844ccc9f0731efa660979bdae9a77fb3d /controller.c
parent4c1d067068fdb9e5f723b3548bddb64e0b06fc36 (diff)
downloadlibsigrokdecode-41a5d9624022856f4ef357c1fdce041a9774a99c.tar.gz
libsigrokdecode-41a5d9624022856f4ef357c1fdce041a9774a99c.zip
sr: Name all callback data 'cb_data'.
Diffstat (limited to 'controller.c')
-rw-r--r--controller.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/controller.c b/controller.c
index ddac3ba..643cf46 100644
--- a/controller.c
+++ b/controller.c
@@ -769,10 +769,10 @@ SRD_API int srd_session_feed(uint64_t start_samplenum, uint8_t *inbuf,
* @param output_type The output type this callback will receive. Only one
* callback per output type can be registered.
* @param cb The function to call.
- * @param user_data Unused.
+ * @param cb_data Unused.
*/
SRD_API int srd_register_callback(int output_type,
- srd_pd_output_callback_t cb, void *user_data)
+ srd_pd_output_callback_t cb, void *cb_data)
{
struct srd_pd_callback *pd_cb;
@@ -785,7 +785,7 @@ SRD_API int srd_register_callback(int output_type,
pd_cb->output_type = output_type;
pd_cb->cb = cb;
- pd_cb->user_data = user_data;
+ pd_cb->cb_data = cb_data;
callbacks = g_slist_append(callbacks, pd_cb);
return SRD_OK;