diff options
-rw-r--r-- | gatchat/gatchat.c | 9 | ||||
-rw-r--r-- | gatchat/gatchat.h | 3 | ||||
-rw-r--r-- | gatchat/gatmux.c | 4 | ||||
-rw-r--r-- | gatchat/gatmux.h | 2 | ||||
-rw-r--r-- | gatchat/gatserver.c | 8 | ||||
-rw-r--r-- | gatchat/gatserver.h | 2 |
6 files changed, 15 insertions, 13 deletions
diff --git a/gatchat/gatchat.c b/gatchat/gatchat.c index ccb2a26a..418ddd66 100644 --- a/gatchat/gatchat.c +++ b/gatchat/gatchat.c @@ -745,9 +745,9 @@ static void wakeup_cb(gboolean ok, GAtResult *result, gpointer user_data) chat->timeout_source = 0; } -static gboolean wakeup_no_response(gpointer user) +static gboolean wakeup_no_response(gpointer user_data) { - GAtChat *chat = user; + GAtChat *chat = user_data; struct at_command *cmd = g_queue_peek_head(chat->command_queue); if (chat->debugf) @@ -1053,13 +1053,14 @@ gboolean g_at_chat_set_disconnect_function(GAtChat *chat, return TRUE; } -gboolean g_at_chat_set_debug(GAtChat *chat, GAtDebugFunc func, gpointer user) +gboolean g_at_chat_set_debug(GAtChat *chat, + GAtDebugFunc func, gpointer user_data) { if (chat == NULL) return FALSE; chat->debugf = func; - chat->debug_data = user; + chat->debug_data = user_data; return TRUE; } diff --git a/gatchat/gatchat.h b/gatchat/gatchat.h index 5a91d242..58c7155f 100644 --- a/gatchat/gatchat.h +++ b/gatchat/gatchat.h @@ -58,7 +58,8 @@ gboolean g_at_chat_set_disconnect_function(GAtChat *chat, * provided to GAtChat the logging function will be called with the * input/output string and user data */ -gboolean g_at_chat_set_debug(GAtChat *chat, GAtDebugFunc func, gpointer user); +gboolean g_at_chat_set_debug(GAtChat *chat, + GAtDebugFunc func, gpointer user_data); /*! * Queue an AT command for execution. The command contents are given diff --git a/gatchat/gatmux.c b/gatchat/gatmux.c index 44d2ee8c..8187492b 100644 --- a/gatchat/gatmux.c +++ b/gatchat/gatmux.c @@ -642,13 +642,13 @@ gboolean g_at_mux_set_disconnect_function(GAtMux *mux, return TRUE; } -gboolean g_at_mux_set_debug(GAtMux *mux, GAtDebugFunc func, gpointer user) +gboolean g_at_mux_set_debug(GAtMux *mux, GAtDebugFunc func, gpointer user_data) { if (mux == NULL) return FALSE; mux->debugf = func; - mux->debug_data = user; + mux->debug_data = user_data; return TRUE; } diff --git a/gatchat/gatmux.h b/gatchat/gatmux.h index 1d608694..1871f715 100644 --- a/gatchat/gatmux.h +++ b/gatchat/gatmux.h @@ -67,7 +67,7 @@ gboolean g_at_mux_shutdown(GAtMux *mux); gboolean g_at_mux_set_disconnect_function(GAtMux *mux, GAtDisconnectFunc disconnect, gpointer user_data); -gboolean g_at_mux_set_debug(GAtMux *mux, GAtDebugFunc func, gpointer user); +gboolean g_at_mux_set_debug(GAtMux *mux, GAtDebugFunc func, gpointer user_data); GIOChannel *g_at_mux_create_channel(GAtMux *mux); diff --git a/gatchat/gatserver.c b/gatchat/gatserver.c index 1e445b2a..b9d9e4f2 100644 --- a/gatchat/gatserver.c +++ b/gatchat/gatserver.c @@ -1252,25 +1252,25 @@ gboolean g_at_server_shutdown(GAtServer *server) gboolean g_at_server_set_disconnect_function(GAtServer *server, GAtDisconnectFunc disconnect, - gpointer user) + gpointer user_data) { if (server == NULL) return FALSE; server->user_disconnect = disconnect; - server->user_disconnect_data = user; + server->user_disconnect_data = user_data; return TRUE; } gboolean g_at_server_set_debug(GAtServer *server, GAtDebugFunc func, - gpointer user) + gpointer user_data) { if (server == NULL) return FALSE; server->debugf = func; - server->debug_data = user; + server->debug_data = user_data; return TRUE; } diff --git a/gatchat/gatserver.h b/gatchat/gatserver.h index bba8c2b0..b604c374 100644 --- a/gatchat/gatserver.h +++ b/gatchat/gatserver.h @@ -79,7 +79,7 @@ gboolean g_at_server_set_disconnect_function(GAtServer *server, gpointer user_data); gboolean g_at_server_set_debug(GAtServer *server, GAtDebugFunc func, - gpointer user); + gpointer user_data); gboolean g_at_server_register(GAtServer *server, char *prefix, GAtServerNotifyFunc notify, |