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

Fix: Don't pass ofono_network_operator structures

This commit is contained in:
Denis Kenzior 2009-10-29 15:28:26 -05:00
parent 177c9672d1
commit fd6d9f9fc7
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cbs.c
View File

@ -700,7 +700,7 @@ out:
}
static void cbs_location_changed(int status, int lac, int ci, int tech,
const struct ofono_network_operator *op,
const char *mcc, const char *mnc,
void *data)
{
struct ofono_cbs *cbs = data;
@ -708,9 +708,9 @@ static void cbs_location_changed(int status, int lac, int ci, int tech,
gboolean lac_changed = FALSE;
gboolean ci_changed = FALSE;
DBG("%d, %d, %d, %d, %p", status, lac, ci, tech, op);
DBG("%d, %d, %d, %d, %s%s", status, lac, ci, tech, mcc, mnc);
if (op == NULL) {
if (!mcc || !mnc) {
if (cbs->mcc[0] == '\0' && cbs->mnc[0] == '\0')
return;
@ -721,9 +721,9 @@ static void cbs_location_changed(int status, int lac, int ci, int tech,
goto out;
}
if (strcmp(cbs->mcc, op->mcc) || strcmp(cbs->mnc, op->mnc)) {
memcpy(cbs->mcc, op->mcc, sizeof(cbs->mcc));
memcpy(cbs->mnc, op->mnc, sizeof(cbs->mnc));
if (strcmp(cbs->mcc, mcc) || strcmp(cbs->mnc, mnc)) {
memcpy(cbs->mcc, mcc, sizeof(cbs->mcc));
memcpy(cbs->mnc, mnc, sizeof(cbs->mnc));
plmn_changed = TRUE;
goto out;

2
src/gprs.c
View File

@ -569,7 +569,7 @@ static void gprs_netreg_update(struct ofono_gprs *gprs)
}
static void netreg_status_changed(int status, int lac, int ci, int tech,
const struct ofono_network_operator *op,
const char *mcc, const char *mnc,
void *data)
{
struct ofono_gprs *gprs = data;

2
src/ofono.h
View File

@ -208,7 +208,7 @@ void __ofono_ussd_passwd_unregister(struct ofono_ussd *ussd, const char *sc);
#include <ofono/netreg.h>
typedef void (*ofono_netreg_status_notify_cb_t)(int status, int lac, int ci,
int tech, const struct ofono_network_operator *op,
int tech, const char *mcc, const char *mnc,
void *data);
unsigned int __ofono_netreg_add_status_watch(struct ofono_netreg *netreg,