summaryrefslogtreecommitdiff
path: root/controller.c
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2012-02-11 22:09:18 +0100
committerUwe Hermann <uwe@hermann-uwe.de>2012-02-11 22:42:40 +0100
commite09023b9dc8f1d6783a3bf6b05402a88060a795f (patch)
tree45dfece4b4139c22f1e2de7a2da5e3fabae3f162 /controller.c
parentae53d0a5971121e03a07c469e39ff3cfa34a2111 (diff)
downloadlibsigrokdecode-e09023b9dc8f1d6783a3bf6b05402a88060a795f.tar.gz
libsigrokdecode-e09023b9dc8f1d6783a3bf6b05402a88060a795f.zip
Rename 'void *' callback parameters to 'user_data'.
This is better, both for consistency reasons, and also because 'data' is a bit too generic and might be confusing, especially since we have other 'data' fields in the code in various places.
Diffstat (limited to 'controller.c')
-rw-r--r--controller.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/controller.c b/controller.c
index 6e6e435..3c50d8a 100644
--- a/controller.c
+++ b/controller.c
@@ -693,7 +693,7 @@ SRD_API int srd_session_feed(uint64_t start_samplenum, uint8_t * inbuf,
}
SRD_API int srd_register_callback(int output_type,
- srd_pd_output_callback_t cb, void *data)
+ srd_pd_output_callback_t cb, void *user_data)
{
struct srd_pd_callback *pd_cb;
@@ -706,7 +706,7 @@ SRD_API int srd_register_callback(int output_type,
pd_cb->output_type = output_type;
pd_cb->callback = cb;
- pd_cb->data = data;
+ pd_cb->user_data = user_data;
callbacks = g_slist_append(callbacks, pd_cb);
return SRD_OK;