From: Uwe Hermann <redacted>
Date: Wed, 29 Feb 2012 21:32:34 +0000 (+0100)
Subject: sr: Name all callback data 'cb_data'.
X-Git-Tag: libsigrokdecode-0.1.0~40
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=41a5d9624022856f4ef357c1fdce041a9774a99c;p=libsigrokdecode.git

sr: Name all callback data 'cb_data'.
---

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;
diff --git a/log.c b/log.c
index d8e98ba..dda689b 100644
--- a/log.c
+++ b/log.c
@@ -27,7 +27,7 @@
 static int srd_loglevel = SRD_LOG_WARN; /* Show errors+warnings per default. */
 
 /* Function prototype. */
-static int srd_logv(void *user_data, int loglevel, const char *format,
+static int srd_logv(void *cb_data, int loglevel, const char *format,
 		    va_list args);
 
 /* Pointer to the currently selected log handler. Default: srd_logv(). */
@@ -130,26 +130,26 @@ SRD_API char *srd_log_logdomain_get(void)
  *
  * @param handler Function pointer to the log handler function to use.
  *                Must not be NULL.
- * @param user_data Pointer to private data to be passed on. This can be used
- *                  by the caller to pass arbitrary data to the log functions.
- *                  This pointer is only stored or passed on by libsigrokdecode,
- *                  and is never used or interpreted in any way. The pointer
- *                  is allowed to be NULL if the caller doesn't need/want to
- *                  pass any data.
+ * @param cb_data Pointer to private data to be passed on. This can be used
+ *                by the caller to pass arbitrary data to the log functions.
+ *                This pointer is only stored or passed on by libsigrokdecode,
+ *                and is never used or interpreted in any way. The pointer
+ *                is allowed to be NULL if the caller doesn't need/want to
+ *                pass any data.
  *
  * @return SRD_OK upon success, SRD_ERR_ARG upon invalid arguments.
  */
-SRD_API int srd_log_handler_set(srd_log_handler_t handler, void *user_data)
+SRD_API int srd_log_handler_set(srd_log_handler_t handler, void *cb_data)
 {
 	if (!handler) {
 		srd_err("log: %s: handler was NULL", __func__);
 		return SRD_ERR_ARG;
 	}
 
-	/* Note: 'user_data' is allowed to be NULL. */
+	/* Note: 'cb_data' is allowed to be NULL. */
 
 	srd_log_handler = handler;
-	srd_log_handler_data = user_data;
+	srd_log_handler_data = cb_data;
 
 	return SRD_OK;
 }
@@ -173,13 +173,13 @@ SRD_API int srd_log_handler_set_default(void)
 	return SRD_OK;
 }
 
-static int srd_logv(void *user_data, int loglevel, const char *format,
+static int srd_logv(void *cb_data, int loglevel, const char *format,
 		    va_list args)
 {
 	int ret;
 
 	/* This specific log handler doesn't need the void pointer data. */
-	(void)user_data;
+	(void)cb_data;
 
 	/* Only output messages of at least the selected loglevel(s). */
 	if (loglevel > srd_loglevel)
diff --git a/sigrokdecode.h b/sigrokdecode.h
index b70dace..84b1aff 100644
--- a/sigrokdecode.h
+++ b/sigrokdecode.h
@@ -174,12 +174,12 @@ struct srd_proto_data {
 };
 
 typedef void (*srd_pd_output_callback_t)(struct srd_proto_data *pdata,
-					 void *user_data);
+					 void *cb_data);
 
 struct srd_pd_callback {
 	int output_type;
 	srd_pd_output_callback_t cb;
-	void *user_data;
+	void *cb_data;
 };
 
 /* custom python types */
@@ -215,7 +215,7 @@ SRD_API int srd_session_start(int num_probes, int unitsize,
 SRD_API int srd_session_feed(uint64_t start_samplenum, uint8_t *inbuf,
 			     uint64_t inbuflen);
 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);
 
 /*--- decoder.c -------------------------------------------------------------*/
 
@@ -229,12 +229,12 @@ SRD_API char *srd_decoder_doc(struct srd_decoder *dec);
 
 /*--- log.c -----------------------------------------------------------------*/
 
-typedef int (*srd_log_handler_t)(void *user_data, int loglevel,
+typedef int (*srd_log_handler_t)(void *cb_data, int loglevel,
 				 const char *format, va_list args);
 
 SRD_API int srd_log_loglevel_set(int loglevel);
 SRD_API int srd_log_loglevel_get(void);
-SRD_API int srd_log_handler_set(srd_log_handler_t handler, void *user_data);
+SRD_API int srd_log_handler_set(srd_log_handler_t handler, void *cb_data);
 SRD_API int srd_log_handler_set_default(void);
 SRD_API int srd_log_logdomain_set(const char *logdomain);
 SRD_API char *srd_log_logdomain_get(void);