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

Fix: Don't use ofono_debug directly in the core 

Use DBG macro which is integrated with the new debug framework.
This commit is contained in:
Denis Kenzior 2010-02-08 11:54:03 -06:00
parent c02dc9c68b
commit 87ca1b0c8f
13 changed files with 82 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/call-barring.c
View File

@ -328,7 +328,7 @@ static void cb_ss_set_lock_callback(const struct ofono_error *error,
struct ofono_call_barring *cb = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Enabling/disabling Call Barring via SS failed");
DBG("Enabling/disabling Call Barring via SS failed");
__ofono_dbus_pending_reply(&cb->pending,
__ofono_error_failed(cb->pending));
return;
@ -380,10 +380,10 @@ static gboolean cb_ss_control(int type, const char *sc,
return TRUE;
}
ofono_debug("Received call barring ss control request");
DBG("Received call barring ss control request");
ofono_debug("type: %d, sc: %s, sia: %s, sib: %s, sic: %s, dn: %s",
type, sc, sia, sib, sic, dn);
DBG("type: %d, sc: %s, sia: %s, sib: %s, sic: %s, dn: %s",
type, sc, sia, sib, sic, dn);
fac = cb_ss_service_to_fac(sc);
if (!fac)
@ -490,7 +490,7 @@ static void cb_set_passwd_callback(const struct ofono_error *error, void *data)
reply = dbus_message_new_method_return(cb->pending);
else {
reply = __ofono_error_failed(cb->pending);
ofono_debug("Changing Call Barring password via SS failed");
DBG("Changing Call Barring password via SS failed");
}
__ofono_dbus_pending_reply(&cb->pending, reply);
@ -512,9 +512,9 @@ static gboolean cb_ss_passwd(const char *sc,
return TRUE;
}
ofono_debug("Received call barring ss password change request");
DBG("Received call barring ss password change request");
ofono_debug("sc: %s", sc);
DBG("sc: %s", sc);
if (!strcmp(sc, ""))
fac = "AB";
@ -728,7 +728,7 @@ static void set_lock_callback(const struct ofono_error *error, void *data)
struct ofono_call_barring *cb = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Enabling/disabling a lock failed");
DBG("Enabling/disabling a lock failed");
__ofono_dbus_pending_reply(&cb->pending,
__ofono_error_failed(cb->pending));
return;
@ -876,7 +876,7 @@ static void disable_all_callback(const struct ofono_error *error, void *data)
struct ofono_call_barring *cb = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Disabling all barring failed");
DBG("Disabling all barring failed");
__ofono_dbus_pending_reply(&cb->pending,
__ofono_error_failed(cb->pending));
return;

25
src/call-forwarding.c
View File

@ -129,7 +129,7 @@ static void cf_cond_list_print(GSList *list)
for (l = list; l; l = l->next) {
cond = l->data;
ofono_debug("CF Condition status: %d, class: %d, number: %s,"
DBG("CF Condition status: %d, class: %d, number: %s,"
" number_type: %d, time: %d",
cond->status, cond->cls, cond->phone_number.number,
cond->phone_number.type, cond->time);
@ -396,7 +396,7 @@ static void get_query_cf_callback(const struct ofono_error *error, int total,
l = cf_cond_list_create(total, list);
set_new_cond_list(cf, cf->query_next, l);
ofono_debug("%s conditions:", cf_type_lut[cf->query_next]);
DBG("%s conditions:", cf_type_lut[cf->query_next]);
cf_cond_list_print(l);
if (cf->query_next == CALL_FORWARDING_TYPE_NOT_REACHABLE)
@ -519,7 +519,7 @@ static void set_query_cf_callback(const struct ofono_error *error, int total,
l = cf_cond_list_create(total, list);
set_new_cond_list(cf, cf->query_next, l);
ofono_debug("%s conditions:", cf_type_lut[cf->query_next]);
DBG("%s conditions:", cf_type_lut[cf->query_next]);
cf_cond_list_print(l);
if (cf->query_next != cf->query_end) {
@ -539,7 +539,7 @@ static void set_property_callback(const struct ofono_error *error, void *data)
struct ofono_call_forwarding *cf = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Error occurred during set/erasure");
DBG("Error occurred during set/erasure");
__ofono_dbus_pending_reply(&cf->pending,
__ofono_error_failed(cf->pending));
return;
@ -565,8 +565,7 @@ static DBusMessage *set_property_request(struct ofono_call_forwarding *cf,
cf->query_next = type;
cf->query_end = type;
ofono_debug("Farming off request, will be erasure: %d",
ph->number[0] == '\0');
DBG("Farming off request, will be erasure: %d", ph->number[0] == '\0');
if (ph->number[0] != '\0')
cf->driver->registration(cf, type, cls, ph, timeout,
@ -664,7 +663,7 @@ static void disable_conditional_callback(const struct ofono_error *error,
struct ofono_call_forwarding *cf = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Error occurred during conditional erasure");
DBG("Error occurred during conditional erasure");
__ofono_dbus_pending_reply(&cf->pending,
__ofono_error_failed(cf->pending));
@ -682,7 +681,7 @@ static void disable_all_callback(const struct ofono_error *error, void *data)
struct ofono_call_forwarding *cf = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Error occurred during erasure of all");
DBG("Error occurred during erasure of all");
__ofono_dbus_pending_reply(&cf->pending,
__ofono_error_failed(cf->pending));
@ -835,7 +834,7 @@ static void ss_set_query_cf_callback(const struct ofono_error *error, int total,
}
l = cf_cond_list_create(total, list);
ofono_debug("%s conditions:", cf_type_lut[cf->query_next]);
DBG("%s conditions:", cf_type_lut[cf->query_next]);
cf_cond_list_print(l);
cf->ss_req->cf_list[cf->query_next] = l;
@ -866,7 +865,7 @@ static void cf_ss_control_callback(const struct ofono_error *error, void *data)
struct ofono_call_forwarding *cf = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Error occurred during cf ss control set/erasure");
DBG("Error occurred during cf ss control set/erasure");
__ofono_dbus_pending_reply(&cf->pending,
__ofono_error_failed(cf->pending));
@ -903,10 +902,10 @@ static gboolean cf_ss_control(int type, const char *sc,
return TRUE;
}
ofono_debug("Received call forwarding ss control request");
DBG("Received call forwarding ss control request");
ofono_debug("type: %d, sc: %s, sia: %s, sib: %s, sic: %s, dn: %s",
type, sc, sia, sib, sic, dn);
DBG("type: %d, sc: %s, sia: %s, sib: %s, sic: %s, dn: %s",
type, sc, sia, sib, sic, dn);
if (!strcmp(sc, "21"))
cf_type = CALL_FORWARDING_TYPE_UNCONDITIONAL;

6
src/call-meter.c
View File

@ -335,7 +335,7 @@ static void set_acm_max_callback(const struct ofono_error *error, void *data)
struct ofono_call_meter *cm = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Setting acm_max failed");
DBG("Setting acm_max failed");
__ofono_dbus_pending_reply(&cm->pending,
__ofono_error_failed(cm->pending));
return;
@ -396,7 +396,7 @@ static void set_puct_callback(const struct ofono_error *error, void *data)
struct ofono_call_meter *cm = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("setting puct failed");
DBG("setting puct failed");
__ofono_dbus_pending_reply(&cm->pending,
__ofono_error_failed(cm->pending));
return;
@ -592,7 +592,7 @@ static void acm_reset_callback(const struct ofono_error *error, void *data)
struct ofono_call_meter *cm = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("reseting acm failed");
DBG("reseting acm failed");
__ofono_dbus_pending_reply(&cm->pending,
__ofono_error_failed(cm->pending));
return;

16
src/call-settings.c
View File

@ -372,7 +372,7 @@ static void cw_ss_query_callback(const struct ofono_error *error, int status,
struct ofono_call_settings *cs = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("setting CW via SS failed");
DBG("setting CW via SS failed");
cs->flags &= ~CALL_SETTINGS_FLAG_CACHED;
__ofono_dbus_pending_reply(&cs->pending,
@ -391,7 +391,7 @@ static void cw_ss_set_callback(const struct ofono_error *error, void *data)
struct ofono_call_settings *cs = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("setting CW via SS failed");
DBG("setting CW via SS failed");
__ofono_dbus_pending_reply(&cs->pending,
__ofono_error_failed(cs->pending));
@ -527,7 +527,7 @@ static void clip_colp_colr_ss_query_cb(const struct ofono_error *error,
const char *value;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Error occurred during ss control query");
DBG("Error occurred during ss control query");
__ofono_dbus_pending_reply(&cs->pending,
__ofono_error_failed(cs->pending));
@ -611,7 +611,7 @@ static gboolean clip_colp_colr_ss(int type,
return TRUE;
}
ofono_debug("Received CLIP/COLR/COLP query ss control");
DBG("Received CLIP/COLR/COLP query ss control");
cs->pending = dbus_message_ref(msg);
@ -627,7 +627,7 @@ static void clir_ss_query_callback(const struct ofono_error *error,
const char *value;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("setting clir via SS failed");
DBG("setting clir via SS failed");
__ofono_dbus_pending_reply(&cs->pending,
__ofono_error_failed(cs->pending));
@ -675,7 +675,7 @@ static void clir_ss_set_callback(const struct ofono_error *error, void *data)
struct ofono_call_settings *cs = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("setting clir via SS failed");
DBG("setting clir via SS failed");
__ofono_dbus_pending_reply(&cs->pending,
__ofono_error_failed(cs->pending));
@ -996,7 +996,7 @@ static void clir_set_callback(const struct ofono_error *error, void *data)
struct ofono_call_settings *cs = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("setting clir failed");
DBG("setting clir failed");
__ofono_dbus_pending_reply(&cs->pending,
__ofono_error_failed(cs->pending));
@ -1058,7 +1058,7 @@ static void cw_set_callback(const struct ofono_error *error, void *data)
struct ofono_call_settings *cs = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Error occurred during CW set");
DBG("Error occurred during CW set");
__ofono_dbus_pending_reply(&cs->pending,
__ofono_error_failed(cs->pending));

10
src/cbs.c
View File

@ -331,7 +331,7 @@ static void cbs_set_topics_cb(const struct ofono_error *error, void *data)
g_slist_free(cbs->new_topics);
cbs->new_topics = NULL;
ofono_debug("Setting Cell Broadcast topics failed");
DBG("Setting Cell Broadcast topics failed");
__ofono_dbus_pending_reply(&cbs->pending,
__ofono_error_failed(cbs->pending));
return;
@ -770,7 +770,7 @@ static void sim_cbmi_read_cb(int ok, int length, int record,
return;
str = cbs_topic_ranges_to_string(cbs->efcbmi_contents);
ofono_debug("Got cbmi: %s", str);
DBG("Got cbmi: %s", str);
g_free(str);
}
@ -817,7 +817,7 @@ static void sim_cbmir_read_cb(int ok, int length, int record,
return;
str = cbs_topic_ranges_to_string(cbs->efcbmir_contents);
ofono_debug("Got cbmir: %s", str);
DBG("Got cbmir: %s", str);
g_free(str);
}
@ -860,7 +860,7 @@ static void sim_cbmid_read_cb(int ok, int length, int record,
cbs->efcbmid_contents = g_slist_reverse(contents);
str = cbs_topic_ranges_to_string(cbs->efcbmid_contents);
ofono_debug("Got cbmid: %s", str);
DBG("Got cbmid: %s", str);
g_free(str);
done:
@ -872,7 +872,7 @@ static void cbs_got_imsi(struct ofono_cbs *cbs)
const char *imsi = ofono_sim_get_imsi(cbs->sim);
char *topics_str;
ofono_debug("Got IMSI: %s", imsi);
DBG("Got IMSI: %s", imsi);
cbs->settings = storage_open(imsi, SETTINGS_STORE);
if (cbs->settings == NULL)

10
src/gprs.c
View File

@ -416,7 +416,7 @@ static void pri_activate_callback(const struct ofono_error *error,
DBG("%p %s", ctx, interface);
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Activating context failed with error: %s",
DBG("Activating context failed with error: %s",
telephony_error_to_str(error));
__ofono_dbus_pending_reply(&gc->pending,
__ofono_error_failed(gc->pending));
@ -453,7 +453,7 @@ static void pri_deactivate_callback(const struct ofono_error *error, void *data)
dbus_bool_t value;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Deactivating context failed with error: %s",
DBG("Deactivating context failed with error: %s",
telephony_error_to_str(error));
__ofono_dbus_pending_reply(&gc->pending,
__ofono_error_failed(gc->pending));
@ -1223,7 +1223,7 @@ static DBusMessage *gprs_create_context(DBusConnection *conn,
return __ofono_error_failed(msg);
}
ofono_debug("Registering new context");
DBG("Registering new context");
if (!context_dbus_register(context)) {
ofono_error("Unable to register primary context");
@ -1275,7 +1275,7 @@ static void gprs_deactivate_for_remove(const struct ofono_error *error,
char **objpath_list;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Removing context failed with error: %s",
DBG("Removing context failed with error: %s",
telephony_error_to_str(error));
__ofono_dbus_pending_reply(&gprs->pending,
@ -1341,7 +1341,7 @@ static DBusMessage *gprs_remove_context(DBusConnection *conn,
storage_sync(gprs->imsi, SETTINGS_STORE, gprs->settings);
}
ofono_debug("Unregistering context: %s\n", ctx->path);
DBG("Unregistering context: %s\n", ctx->path);
context_dbus_unregister(ctx);
gprs->contexts = g_slist_remove(gprs->contexts, ctx);

2
src/message-waiting.c
View File

@ -418,7 +418,7 @@ static void mw_cphs_mwis_read_cb(int ok, int total_length, int record,
unsigned char indication;
if (!ok || total_length < 1) {
ofono_debug("No CPHS MWIS on SIM");
DBG("No CPHS MWIS on SIM");
mw->ef_cphs_mwis_length = 0;
return;
}

12
src/network.c
View File

@ -246,7 +246,7 @@ static void network_operator_populate_registered(struct ofono_netreg *netreg,
__ofono_atom_get_path(netreg->atom));
if (!dbus_connection_list_registered(conn, path, &children)) {
ofono_debug("Unable to obtain registered NetworkOperator(s)");
DBG("Unable to obtain registered NetworkOperator(s)");
*network_operators = g_try_new0(char *, 1);
return;
}
@ -1153,7 +1153,7 @@ static void operator_list_callback(const struct ofono_error *error, int total,
gboolean need_to_emit;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Error occurred during operator list");
DBG("Error occurred during operator list");
__ofono_dbus_pending_reply(&netreg->pending,
__ofono_error_failed(netreg->pending));
return;
@ -1194,7 +1194,7 @@ static void current_operator_callback(const struct ofono_error *error,
DBG("%p, %p", netreg, netreg->current_operator);
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Error during current operator");
DBG("Error during current operator");
return;
}
@ -1273,7 +1273,7 @@ static void registration_status_callback(const struct ofono_error *error,
struct ofono_netreg *netreg = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Error during registration status query");
DBG("Error during registration status query");
return;
}
@ -1287,7 +1287,7 @@ static void init_registration_status(const struct ofono_error *error,
struct ofono_netreg *netreg = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Error during registration status query");
DBG("Error during registration status query");
return;
}
@ -1346,7 +1346,7 @@ static void signal_strength_callback(const struct ofono_error *error,
struct ofono_netreg *netreg = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Error during signal strength query");
DBG("Error during signal strength query");
return;
}

4
src/radio-settings.c
View File

@ -134,7 +134,7 @@ static void radio_mode_set_callback(const struct ofono_error *error, void *data)
DBusMessage *reply;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Error setting radio access mode");
DBG("Error setting radio access mode");
rs->pending_mode = rs->mode;
reply = __ofono_error_failed(rs->pending);
__ofono_dbus_pending_reply(&rs->pending, reply);
@ -155,7 +155,7 @@ static void radio_rat_mode_query_callback(const struct ofono_error *error,
DBusMessage *reply;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Error during radio access mode query");
DBG("Error during radio access mode query");
reply = __ofono_error_failed(rs->pending);
__ofono_dbus_pending_reply(&rs->pending, reply);
return;

4
src/sim.c
View File

@ -1506,7 +1506,7 @@ static gboolean sim_op_check_cached(struct ofono_sim *sim)
if (fd == -1) {
if (errno != ENOENT)
ofono_debug("Error %i opening cache file for "
DBG("Error %i opening cache file for "
"fileid %04x, IMSI %s",
errno, op->id, imsi);
@ -1810,7 +1810,7 @@ static void sim_cb_download_cb(const struct ofono_error *error,
return;
}
ofono_debug("CellBroadcast download to UICC reported no error");
DBG("CellBroadcast download to UICC reported no error");
}
void __ofono_cbs_sim_download(struct ofono_sim *sim,

24
src/sms.c
View File

@ -206,7 +206,7 @@ static void sca_set_callback(const struct ofono_error *error, void *data)
struct ofono_sms *sms = data;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Setting SCA failed");
DBG("Setting SCA failed");
__ofono_dbus_pending_reply(&sms->pending,
__ofono_error_failed(sms->pending));
return;
@ -272,20 +272,20 @@ static void tx_finished(const struct ofono_error *error, int mr, void *data)
struct ofono_modem *modem = __ofono_atom_get_modem(sms->atom);
struct tx_queue_entry *entry = g_queue_peek_head(sms->txq);
ofono_debug("tx_finished");
DBG("tx_finished");
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
entry->retry += 1;
if (entry->retry != TXQ_MAX_RETRIES) {
ofono_debug("Sending failed, retry in %d secs",
DBG("Sending failed, retry in %d secs",
entry->retry * 5);
sms->tx_source = g_timeout_add_seconds(entry->retry * 5,
tx_next, sms);
return;
}
ofono_debug("Max retries reached, giving up");
DBG("Max retries reached, giving up");
entry = g_queue_pop_head(sms->txq);
__ofono_dbus_pending_reply(&entry->msg,
@ -299,7 +299,7 @@ static void tx_finished(const struct ofono_error *error, int mr, void *data)
g_free(entry);
if (g_queue_peek_head(sms->txq)) {
ofono_debug("Previous send failed, scheduling next");
DBG("Previous send failed, scheduling next");
sms->tx_source = g_timeout_add(0, tx_next, sms);
}
@ -325,7 +325,7 @@ static void tx_finished(const struct ofono_error *error, int mr, void *data)
g_free(entry);
if (g_queue_peek_head(sms->txq)) {
ofono_debug("Scheduling next");
DBG("Scheduling next");
sms->tx_source = g_timeout_add(0, tx_next, sms);
}
}
@ -341,7 +341,7 @@ static gboolean tx_next(gpointer user_data)
error.type = OFONO_ERROR_TYPE_NO_ERROR;
ofono_debug("tx_next: %p", entry);
DBG("tx_next: %p", entry);
sms->tx_source = 0;
@ -393,7 +393,7 @@ static struct tx_queue_entry *create_tx_queue_entry(GSList *msg_list)
sms_encode(s, &pdu->pdu_len, &pdu->tpdu_len, pdu->pdu);
ofono_debug("pdu_len: %d, tpdu_len: %d",
DBG("pdu_len: %d, tpdu_len: %d",
pdu->pdu_len, pdu->tpdu_len);
}
@ -424,7 +424,7 @@ static DBusMessage *sms_send_message(DBusConnection *conn, DBusMessage *msg,
if (!msg_list)
return __ofono_error_invalid_format(msg);
ofono_debug("ref: %d, offset: %d", sms->ref, ref_offset);
DBG("ref: %d, offset: %d", sms->ref, ref_offset);
set_ref_and_to(msg_list, sms->ref, ref_offset, to);
entry = create_tx_queue_entry(msg_list);
@ -474,9 +474,9 @@ static GDBusSignalTable sms_manager_signals[] = {
static void dispatch_app_datagram(struct ofono_sms *sms, int dst, int src,
unsigned char *buf, long len)
{
ofono_debug("Got app datagram for dst port: %d, src port: %d",
DBG("Got app datagram for dst port: %d, src port: %d",
dst, src);
ofono_debug("Contents-Len: %ld", len);
DBG("Contents-Len: %ld", len);
}
static void dispatch_text_message(struct ofono_sms *sms,
@ -714,7 +714,7 @@ void ofono_sms_deliver_notify(struct ofono_sms *sms, unsigned char *pdu,
}
if (s.deliver.pid == SMS_PID_TYPE_SM_TYPE_0) {
ofono_debug("Explicitly ignoring type 0 SMS");
DBG("Explicitly ignoring type 0 SMS");
return;
}

16
src/ussd.c
View File

@ -231,13 +231,13 @@ static gboolean recognized_control_string(struct ofono_ussd *ussd,
int type;
gboolean ret = FALSE;
ofono_debug("parsing control string");
DBG("parsing control string");
if (parse_ss_control_string(str, &type, &sc,
&sia, &sib, &sic, &sid, &dn)) {
GSList *l = ussd->ss_control_list;
ofono_debug("Got parse result: %d, %s, %s, %s, %s, %s, %s",
DBG("Got parse result: %d, %s, %s, %s, %s, %s, %s",
type, sc, sia, sib, sic, sid, dn);
/* A password change string needs to be treated separately
@ -332,7 +332,7 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, const char *str)
ussd->state = USSD_STATE_IDLE;
} else {
ofono_error("Received an unsolicited USSD, ignoring for now...");
ofono_debug("USSD is: status: %d, %s", status, str);
DBG("USSD is: status: %d, %s", status, str);
return;
}
@ -351,7 +351,7 @@ static void ussd_callback(const struct ofono_error *error, void *data)
DBusMessage *reply;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
ofono_debug("ussd request failed with error: %s",
DBG("ussd request failed with error: %s",
telephony_error_to_str(error));
ussd->flags &= ~USSD_FLAG_PENDING;
@ -391,15 +391,15 @@ static DBusMessage *ussd_initiate(DBusConnection *conn, DBusMessage *msg,
if (strlen(str) == 0)
return __ofono_error_invalid_format(msg);
ofono_debug("checking if this is a recognized control string");
DBG("checking if this is a recognized control string");
if (recognized_control_string(ussd, str, msg))
return NULL;
ofono_debug("No.., checking if this is a USSD string");
DBG("No.., checking if this is a USSD string");
if (!valid_ussd_string(str))
return __ofono_error_invalid_format(msg);
ofono_debug("OK, running USSD request");
DBG("OK, running USSD request");
if (!ussd->driver->request)
return __ofono_error_not_implemented(msg);
@ -418,7 +418,7 @@ static void ussd_cancel_callback(const struct ofono_error *error, void *data)
DBusMessage *reply;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
ofono_debug("ussd cancel failed with error: %s",
DBG("ussd cancel failed with error: %s",
telephony_error_to_str(error));
ussd->flags &= ~USSD_FLAG_PENDING;

18
src/voicecall.c
View File

@ -879,7 +879,7 @@ static void dial_callback(const struct ofono_error *error, void *data)
gboolean need_to_emit = FALSE;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("Dial callback returned error: %s",
DBG("Dial callback returned error: %s",
telephony_error_to_str(error));
reply = __ofono_error_failed(vc->pending);
__ofono_dbus_pending_reply(&vc->pending, reply);
@ -917,7 +917,7 @@ static void dial_callback(const struct ofono_error *error, void *data)
v->detect_time = time(NULL);
ofono_debug("Registering new call: %d", call->id);
DBG("Registering new call: %d", call->id);
voicecall_dbus_register(v);
vc->call_list = g_slist_insert_sorted(vc->call_list, v,
@ -1167,7 +1167,7 @@ static void private_chat_callback(const struct ofono_error *error, void *data)
GSList *l;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("command failed with error: %s",
DBG("command failed with error: %s",
telephony_error_to_str(error));
__ofono_dbus_pending_reply(&vc->pending,
__ofono_error_failed(vc->pending));
@ -1261,7 +1261,7 @@ static void multiparty_create_callback(const struct ofono_error *error, void *da
DBusMessage *reply;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_debug("command failed with error: %s",
DBG("command failed with error: %s",
telephony_error_to_str(error));
__ofono_dbus_pending_reply(&vc->pending,
__ofono_error_failed(vc->pending));
@ -1465,7 +1465,7 @@ void ofono_voicecall_disconnected(struct ofono_voicecall *vc, int id,
time_t ts;
enum call_status prev_status;
ofono_debug("Got disconnection event for id: %d, reason: %d", id, reason);
DBG("Got disconnection event for id: %d, reason: %d", id, reason);
__ofono_modem_callid_release(modem, id);
@ -1527,14 +1527,14 @@ void ofono_voicecall_notify(struct ofono_voicecall *vc,
struct voicecall *v = NULL;
struct ofono_call *newcall;
ofono_debug("Got a voicecall event, status: %d, id: %u, number: %s",
DBG("Got a voicecall event, status: %d, id: %u, number: %s",
call->status, call->id, call->phone_number.number);
l = g_slist_find_custom(vc->call_list, GUINT_TO_POINTER(call->id),
call_compare_by_id);
if (l) {
ofono_debug("Found call with id: %d\n", call->id);
DBG("Found call with id: %d\n", call->id);
voicecall_set_call_status(l->data, call->status);
voicecall_set_call_lineid(l->data, &call->phone_number,
call->clip_validity);
@ -1542,7 +1542,7 @@ void ofono_voicecall_notify(struct ofono_voicecall *vc,
return;
}
ofono_debug("Did not find a call with id: %d\n", call->id);
DBG("Did not find a call with id: %d\n", call->id);
__ofono_modem_callid_hold(modem, call->id);
@ -1587,7 +1587,7 @@ static void generic_callback(const struct ofono_error *error, void *data)
DBusMessage *reply;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
ofono_debug("command failed with error: %s",
DBG("command failed with error: %s",
telephony_error_to_str(error));
if (error->type == OFONO_ERROR_TYPE_NO_ERROR)