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

Remove some other unused variables

This commit is contained in:
Denis Kenzior 2009-05-12 17:18:46 -05:00 committed by Marcel Holtmann
parent e9ab6dd8ef
commit 95e9c0dcf2
7 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/call-forwarding.c
View File

@ -595,7 +595,6 @@ static void property_set_query_callback(const struct ofono_error *error, int tot
struct set_cf_request *req = data;
struct ofono_modem *modem = req->modem;
struct call_forwarding_data *cf = modem->call_forwarding;
//DBusConnection *conn = dbus_gsm_connection();
DBusMessage *reply;
GSList *new_cf_list;
@ -768,7 +767,6 @@ static void disable_conditional_callback(const struct ofono_error *error,
{
struct ofono_modem *modem = data;
struct call_forwarding_data *cf = modem->call_forwarding;
//DBusConnection *conn = dbus_gsm_connection();
DBusMessage *reply;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
@ -795,7 +793,6 @@ static void disable_all_callback(const struct ofono_error *error, void *data)
{
struct ofono_modem *modem = data;
struct call_forwarding_data *cf = modem->call_forwarding;
//DBusConnection *conn = dbus_gsm_connection();
DBusMessage *reply;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
@ -953,8 +950,6 @@ static void cf_ss_control_query_callback(const struct ofono_error *error,
{
struct ofono_modem *modem = data;
struct call_forwarding_data *cf = modem->call_forwarding;
//DBusConnection *conn = dbus_gsm_connection();
//DBusMessage *reply;
GSList *new_cf_list;
/* Strange, set succeeded but query failed, fallback to direct method */
@ -1221,7 +1216,6 @@ static void cf_not_reachable_callback(const struct ofono_error *error, int total
struct ofono_modem *modem = data;
struct call_forwarding_data *cf = modem->call_forwarding;
GSList *l = NULL;
//DBusConnection *conn = dbus_gsm_connection();
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Error during not reachable CF query");

2
src/call-settings.c
View File

@ -450,7 +450,6 @@ static gboolean clir_ss_control(struct ofono_modem *modem, int type,
{
struct call_settings_data *cs = modem->call_settings;
DBusConnection *conn = dbus_gsm_connection();
//void *op;
if (!cs)
return FALSE;
@ -587,7 +586,6 @@ static void cs_clir_callback(const struct ofono_error *error,
{
struct ofono_modem *modem = data;
struct call_settings_data *cs = modem->call_settings;
//DBusConnection *conn = dbus_gsm_connection();
if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
goto out;

3
src/call-waiting.c
View File

@ -327,7 +327,6 @@ static gboolean cw_ss_control(struct ofono_modem *modem, int type,
DBusConnection *conn = dbus_gsm_connection();
int cls = BEARER_CLASS_DEFAULT;
DBusMessage *reply;
//void *op;
if (!cw)
return FALSE;
@ -411,8 +410,6 @@ static DBusMessage *generate_get_properties_reply(struct ofono_modem *modem,
DBusMessage *reply;
DBusMessageIter iter;
DBusMessageIter dict;
//int i;
//GSList *l;
reply = dbus_message_new_method_return(msg);

1
src/modem.c
View File

@ -261,7 +261,6 @@ void modem_remove_interface(struct ofono_modem *modem, const char *interface)
static void finish_attr_query(struct ofono_modem *modem)
{
//struct ofono_modem_data *info = modem->modem_info;
DBusConnection *conn = dbus_gsm_connection();
DBusMessage *reply;

3
src/network.c
View File

@ -267,7 +267,6 @@ static inline const char *network_operator_build_path(struct ofono_modem *modem,
static void network_operator_emit_available_operators(struct ofono_modem *modem)
{
//struct network_registration_data *netreg = modem->network_registration;
DBusConnection *conn = dbus_gsm_connection();
char **network_operators;
@ -287,7 +286,6 @@ static void set_network_operator_status(struct ofono_modem *modem,
int status)
{
DBusConnection *conn = dbus_gsm_connection();
//struct network_registration_data *netreg = modem->network_registration;
const char *status_str;
const char *path;
@ -308,7 +306,6 @@ static void set_network_operator_technology(struct ofono_modem *modem,
struct ofono_network_operator *op,
int tech)
{
//struct network_registration_data *netreg = modem->network_registration;
DBusConnection *conn = dbus_gsm_connection();
const char *tech_str;
const char *path;

4
src/ussd.c
View File

@ -116,7 +116,6 @@ static gint ss_control_entry_compare(gconstpointer a, gconstpointer b)
static gint ss_control_entry_find_by_service(gconstpointer a, gconstpointer b)
{
const struct ss_control_entry *ca = a;
//const char *cb = b;
return strcmp(ca->service, b);
}
@ -124,7 +123,6 @@ static gint ss_control_entry_find_by_service(gconstpointer a, gconstpointer b)
gboolean ss_control_register(struct ofono_modem *modem, const char *str,
ss_control_cb_t cb)
{
//struct ussd_data *ussd = modem->ussd;
struct ss_control_entry *entry;
if (!modem)
@ -143,7 +141,6 @@ gboolean ss_control_register(struct ofono_modem *modem, const char *str,
void ss_control_unregister(struct ofono_modem *modem, const char *str,
ss_control_cb_t cb)
{
//struct ussd_data *ussd = modem->ussd;
const struct ss_control_entry entry = { (char *)str, cb };
GSList *l;
@ -165,7 +162,6 @@ static gboolean recognized_control_string(struct ofono_modem *modem,
const char *ss_str,
DBusMessage *msg)
{
//struct ussd_data *ussd = modem->ussd;
char *str = g_strdup(ss_str);
char *sc, *sia, *sib, *sic, *dn;
int type;

10
src/voicecall.c
View File

@ -150,7 +150,6 @@ static DBusMessage *voicecall_get_properties(DBusConnection *conn,
DBusMessageIter dict;
const char *status;
const char *callerid;
//char timebuf[512];
const char *timestr = "";
reply = dbus_message_new_method_return(msg);
@ -1139,9 +1138,9 @@ static gboolean real_emit_call_list_changed(void *data)
static void emit_call_list_changed(struct ofono_modem *modem)
{
//struct voicecalls_data *calls = modem->voicecalls;
#ifdef DELAY_EMIT
struct voicecalls_data *calls = modem->voicecalls;
if (!(calls->flags & VOICECALLS_FLAG_UPDATING_CALL_LIST)) {
calls->flags |= VOICECALLS_FLAG_UPDATING_CALL_LIST;
g_timeout_add(0, real_emit_call_list_changed, modem);
@ -1174,9 +1173,9 @@ static gboolean real_emit_multiparty_call_list_changed(void *data)
static void emit_multiparty_call_list_changed(struct ofono_modem *modem)
{
//struct voicecalls_data *calls = modem->voicecalls;
#ifdef DELAY_EMIT
struct voicecalls_data *calls = modem->voicecalls;
if (!(calls->flags & VOICECALLS_FLAG_UPDATING_MPTY_CALL_LIST)) {
calls->flags |= VOICECALLS_FLAG_UPDATING_MPTY_CALL_LIST;
g_timeout_add(0, real_emit_multiparty_call_list_changed, modem);
@ -1242,7 +1241,6 @@ void ofono_voicecall_notify(struct ofono_modem *modem, const struct ofono_call *
struct voicecalls_data *calls = modem->voicecalls;
struct voicecall *v;
struct ofono_call *newcall = NULL;
//const char *member;
ofono_debug("Got a voicecall event, status: %d, id: %u, number: %s",
call->status, call->id, call->phone_number);