sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

The user data pointer variable should be called user_data

This commit is contained in:
Marcel Holtmann 2010-04-11 17:42:40 +02:00
parent 0b2014df05
commit 2dab6bc3a6
6 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gatchat/gatchat.c
View File

@ -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;
}

3
gatchat/gatchat.h
View File

@ -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

4
gatchat/gatmux.c
View File

@ -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;
}

2
gatchat/gatmux.h
View File

@ -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);

8
gatchat/gatserver.c
View File

@ -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;
}

2
gatchat/gatserver.h
View File

@ -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,