X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=sigrokdecode.h;h=e523a45e9cfe7961f8f0aada1da011a32798e905;hp=b70daced5f2e78b6f5defd66c4a043f547417e57;hb=a759e1a143122dd73f9051a3d48c4846839c340e;hpb=4c1d067068fdb9e5f723b3548bddb64e0b06fc36

diff --git a/sigrokdecode.h b/sigrokdecode.h
index b70dace..e523a45 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,13 +229,13 @@ SRD_API char *srd_decoder_doc(struct srd_decoder *dec);
 
 /*--- log.c -----------------------------------------------------------------*/
 
-typedef int (*srd_log_handler_t)(void *user_data, int loglevel,
-				 const char *format, va_list args);
+typedef int (*srd_log_callback_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_default(void);
+SRD_API int srd_log_callback_set(srd_log_callback_t cb, void *cb_data);
+SRD_API int srd_log_callback_set_default(void);
 SRD_API int srd_log_logdomain_set(const char *logdomain);
 SRD_API char *srd_log_logdomain_get(void);