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

Refactor: Get rid of useless netreg parameter

This commit is contained in:
Denis Kenzior 2009-10-29 15:58:09 -05:00
parent 4e69a94a86
commit 40adc85174
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/network.c
View File

@ -305,11 +305,11 @@ static void network_operator_emit_available_operators(struct ofono_netreg *netre
g_strfreev(network_operators); g_strfreev(network_operators);
} }
static void set_network_operator_status(struct ofono_netreg *netreg, static void set_network_operator_status(struct network_operator_data *opd,
struct network_operator_data *opd,
int status) int status)
{ {
DBusConnection *conn = ofono_dbus_get_connection(); DBusConnection *conn = ofono_dbus_get_connection();
struct ofono_netreg *netreg = opd->netreg;
const char *status_str; const char *status_str;
const char *path; const char *path;
@ -399,11 +399,11 @@ static char *get_operator_display_name(struct ofono_netreg *netreg)
return name; return name;
} }
static void set_network_operator_name(struct ofono_netreg *netreg, static void set_network_operator_name(struct network_operator_data *opd,
struct network_operator_data *opd,
const char *name) const char *name)
{ {
DBusConnection *conn = ofono_dbus_get_connection(); DBusConnection *conn = ofono_dbus_get_connection();
struct ofono_netreg *netreg = opd->netreg;
const char *path; const char *path;
const char *operator; const char *operator;
@ -436,11 +436,11 @@ static void set_network_operator_name(struct ofono_netreg *netreg,
} }
} }
static void set_network_operator_eons_info(struct ofono_netreg *netreg, static void set_network_operator_eons_info(struct network_operator_data *opd,
struct network_operator_data *opd,
const struct sim_eons_operator_info *eons_info) const struct sim_eons_operator_info *eons_info)
{ {
DBusConnection *conn = ofono_dbus_get_connection(); DBusConnection *conn = ofono_dbus_get_connection();
struct ofono_netreg *netreg = opd->netreg;
const struct sim_eons_operator_info *old_eons_info = opd->eons_info; const struct sim_eons_operator_info *old_eons_info = opd->eons_info;
const char *path; const char *path;
const char *oldname; const char *oldname;
@ -1002,13 +1002,12 @@ static void operator_list_callback(const struct ofono_error *error, int total,
network_operator_compare); network_operator_compare);
if (o) { /* Update and move to a new list */ if (o) { /* Update and move to a new list */
set_network_operator_status(netreg, o->data, set_network_operator_status(o->data,
list[i].status); list[i].status);
set_network_operator_techs(o->data, list[i].tech); set_network_operator_techs(o->data, list[i].tech);
set_network_operator_name(netreg, o->data, set_network_operator_name(o->data, list[i].name);
list[i].name);
n = g_slist_prepend(n, o->data); n = g_slist_prepend(n, o->data);
netreg->operator_list = netreg->operator_list =
@ -1071,7 +1070,7 @@ static void current_operator_callback(const struct ofono_error *error,
if (netreg->current_operator && if (netreg->current_operator &&
(!current || (!current ||
network_operator_compare(netreg->current_operator, current))) network_operator_compare(netreg->current_operator, current)))
set_network_operator_status(netreg, netreg->current_operator, set_network_operator_status(netreg->current_operator,
OPERATOR_STATUS_AVAILABLE); OPERATOR_STATUS_AVAILABLE);
if (current) if (current)
@ -1079,12 +1078,9 @@ static void current_operator_callback(const struct ofono_error *error,
network_operator_compare); network_operator_compare);
if (op) { if (op) {
set_network_operator_status(netreg, op->data, set_network_operator_status(op->data, OPERATOR_STATUS_CURRENT);
OPERATOR_STATUS_CURRENT);
set_network_operator_technology(netreg, op->data,
current->tech);
set_network_operator_techs(op->data, current->tech); set_network_operator_techs(op->data, current->tech);
set_network_operator_name(netreg, op->data, current->name); set_network_operator_name(op->data, current->name);
if (netreg->current_operator == op->data) if (netreg->current_operator == op->data)
return; return;
@ -1243,7 +1239,7 @@ optimize:
eons_info = sim_eons_lookup(netreg->eons, opd->mcc, opd->mnc); eons_info = sim_eons_lookup(netreg->eons, opd->mcc, opd->mnc);
set_network_operator_eons_info(netreg, opd, eons_info); set_network_operator_eons_info(opd, eons_info);
} }
} }