Remove unused code and make compiler happy

diff --git a/drivers/atmodem/gprs-context.c b/drivers/atmodem/gprs-context.c
index 23ad3db..3cd9ec2 100644 (file)
--- a/drivers/atmodem/gprs-context.c
+++ b/drivers/atmodem/gprs-context.c
@@ -39,7 +39,6 @@
 
 #include "atmodem.h"
 
-static const char *cgdcont_prefix[] = { "+CGDCONT:", NULL };
 static const char *cgact_prefix[] = { "+CGACT:", NULL };
 static const char *none_prefix[] = { NULL };
 
@@ -106,7 +105,6 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
                                at_cgact_up_cb, ncbd, g_free) > 0)
                return;
 
-error:
        if (ncbd)
                g_free(ncbd);
 

diff --git a/drivers/atmodem/gprs.c b/drivers/atmodem/gprs.c
index af43d44..d60fbca 100644 (file)
--- a/drivers/atmodem/gprs.c
+++ b/drivers/atmodem/gprs.c
@@ -189,7 +189,6 @@ out:
 static void cgev_notify(GAtResult *result, gpointer user_data)
 {
        struct ofono_gprs *gprs = user_data;
-       struct gprs_data *gd = ofono_gprs_get_data(gprs);
        GAtResultIter iter;
        const char *event;
 

diff --git a/src/gprs.c b/src/gprs.c
index 03066e2..c45f366 100644 (file)
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -169,8 +169,6 @@ static void pri_set_active_callback(const struct ofono_error *error,
        struct pri_context *ctx = data;
        struct ofono_gprs_context *gc = ctx->gprs->context_driver;
        DBusConnection *conn = ofono_dbus_get_connection();
-       DBusMessage *reply;
-       const char *path;
        dbus_bool_t value;
 
        if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
@@ -292,8 +290,6 @@ static DBusMessage *pri_set_type(struct pri_context *ctx, DBusConnection *conn,
 static DBusMessage *pri_set_name(struct pri_context *ctx, DBusConnection *conn,
                                        DBusMessage *msg, const char *name)
 {
-       int context_type;
-
        if (ctx->name && g_str_equal(ctx->name, name))
                return dbus_message_new_method_return(msg);
 
@@ -320,7 +316,6 @@ static DBusMessage *pri_set_property(DBusConnection *conn,
        const char *property;
        dbus_bool_t value;
        const char *str;
-       const char *path;
 
        if (!dbus_message_iter_init(msg, &iter))
                return __ofono_error_invalid_args(msg);
@@ -509,26 +504,6 @@ static char **gprs_contexts_path_list(GSList *context_list)
        return objlist;
 }
 
-static void gprs_generic_callback(const struct ofono_error *error, void *data)
-{
-       struct ofono_gprs *gprs = data;
-       DBusMessage *reply;
-
-       if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
-               ofono_debug("command failed with error: %s",
-                               telephony_error_to_str(error));
-
-       if (!gprs->pending)
-               return;
-
-       if (error->type == OFONO_ERROR_TYPE_NO_ERROR)
-               reply = dbus_message_new_method_return(gprs->pending);
-       else
-               reply = __ofono_error_failed(gprs->pending);
-
-       __ofono_dbus_pending_reply(&gprs->pending, reply);
-}
-
 static void gprs_attach_callback(const struct ofono_error *error, void *data)
 {
        struct ofono_gprs *gprs = data;