From 55d54e377a501a3c375bb2b3a6baef7545832e51 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Tue, 15 Feb 2011 16:05:02 -0600 Subject: test-server: Fix a few more occurrences --- gatchat/test-server.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gatchat/test-server.c b/gatchat/test-server.c index d024e64a..e574d64c 100644 --- a/gatchat/test-server.c +++ b/gatchat/test-server.c @@ -680,9 +680,9 @@ static void cpms_cb(GAtServer *server, GAtServerRequestType type, } } -static void cnmi_cb(GAtServerRequestType type, GAtResult *cmd, gpointer user) +static void cnmi_cb(GAtServer *server, GAtServerRequestType type, + GAtResult *cmd, gpointer user) { - GAtServer *server = user; char buf[2048]; switch (type) { @@ -703,9 +703,9 @@ static void cnmi_cb(GAtServerRequestType type, GAtResult *cmd, gpointer user) } } -static void cscs_cb(GAtServerRequestType type, GAtResult *cmd, gpointer user) +static void cscs_cb(GAtServer *server, GAtServerRequestType type, + GAtResult *cmd, gpointer user) { - GAtServer *server = user; char buf[2048]; switch (type) { @@ -726,10 +726,9 @@ static void cscs_cb(GAtServerRequestType type, GAtResult *cmd, gpointer user) } } -static void cmgl_cb(GAtServerRequestType type, GAtResult *cmd, gpointer user) +static void cmgl_cb(GAtServer *server, GAtServerRequestType type, + GAtResult *cmd, gpointer user) { - GAtServer *server = user; - switch (type) { case G_AT_SERVER_REQUEST_TYPE_SET: g_at_server_send_final(server, G_AT_SERVER_RESULT_OK); @@ -743,9 +742,9 @@ static void cmgl_cb(GAtServerRequestType type, GAtResult *cmd, gpointer user) } } -static void cpbs_cb(GAtServerRequestType type, GAtResult *cmd, gpointer user) +static void cpbs_cb(GAtServer *server, GAtServerRequestType type, + GAtResult *cmd, gpointer user) { - GAtServer *server = user; char buf[2048]; switch (type) { @@ -766,9 +765,9 @@ static void cpbs_cb(GAtServerRequestType type, GAtResult *cmd, gpointer user) } } -static void dial_cb(GAtServerRequestType type, GAtResult *cmd, gpointer user) +static void dial_cb(GAtServer *server, GAtServerRequestType type, + GAtResult *cmd, gpointer user) { - GAtServer *server = user; GAtServerResult res = G_AT_SERVER_RESULT_ERROR; GAtResultIter iter; const char *dial_str; -- cgit v1.2.3