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: sigrok-cli-0.3.0~16
X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=commitdiff_plain;h=68cdf174d18df9b5a69eea60469caf32d265a906

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

diff --git a/anykey.c b/anykey.c
index f0ab52e..5bc230b 100644
--- a/anykey.c
+++ b/anykey.c
@@ -36,12 +36,12 @@ static DWORD stdin_mode;
 static struct termios term_orig;
 #endif
 
-static int received_anykey(int fd, int revents, void *user_data)
+static int received_anykey(int fd, int revents, void *cb_data)
 {
 	/* Avoid compiler warnings. */
 	(void)fd;
 	(void)revents;
-	(void)user_data;
+	(void)cb_data;
 
 	sr_session_stop();
 
diff --git a/sigrok-cli.c b/sigrok-cli.c
index 461899e..d5427a7 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -514,13 +514,13 @@ err_out:
 	return 0;
 }
 
-void show_pd_annotation(struct srd_proto_data *pdata, void *user_data)
+void show_pd_annotation(struct srd_proto_data *pdata, void *cb_data)
 {
 	int i;
 	char **annotations;
 
-	/* 'user_data' is not used in this specific callback. */
-	(void)user_data;
+	/* 'cb_data' is not used in this specific callback. */
+	(void)cb_data;
 
 	if (pdata->ann_format != 0) {
 		/* CLI only shows the default annotation format. */
@@ -943,11 +943,11 @@ static void run_session(void)
 }
 
 static void logger(const gchar *log_domain, GLogLevelFlags log_level,
-		   const gchar *message, gpointer user_data)
+		   const gchar *message, gpointer cb_data)
 {
 	/* Avoid compiler warnings. */
 	(void)log_domain;
-	(void)user_data;
+	(void)cb_data;
 
 	/*
 	 * All messages, warnings, errors etc. go to stderr (not stdout) in