sr: Name all callback data 'cb_data'.

diff --git a/log.c b/log.c
index 3cc739e212fb9cd1136d7d7da9370b565cb963bd..e863fb42d28885e796ba33f6baef485c42c9ee1a 100644 (file)
--- a/log.c
+++ b/log.c
@@ -21,9 +21,9 @@
 #include "sigrok-gtk.h"
 
 static void logger(const gchar *log_domain, GLogLevelFlags log_level,
-                  const gchar *message, gpointer user_data)
+                  const gchar *message, gpointer cb_data)
 {
-       GtkTextView *tv = user_data;
+       GtkTextView *tv = cb_data;
        g_return_if_fail(GTK_IS_TEXT_VIEW(tv));
        GtkTextBuffer *tb = gtk_text_view_get_buffer(tv);
        GtkTextIter iter;

diff --git a/sigview.c b/sigview.c
index 4863e7fa8d19b2aff99fda8d5f7bb3743e35afc9..cc2c6393fed748352da3360566566b9021028a9f 100644 (file)
--- a/sigview.c
+++ b/sigview.c
@@ -30,14 +30,14 @@
 GtkListStore *siglist;
 
 static void format_func(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
-               GtkTreeModel *siglist, GtkTreeIter *iter, gpointer user_data)
+               GtkTreeModel *siglist, GtkTreeIter *iter, gpointer cb_data)
 {
        int probe;
        char *colour;
        GArray *data;
 
        (void)tree_column;
-       (void)user_data;
+       (void)cb_data;
 
        /* TODO: In future we will get data here from tree model.
         * PD data streams will be kept in the list.  The logic stream