summaryrefslogtreecommitdiffstats
path: root/src/ussd.c
diff options
context:
space:
mode:
authorDenis Kenzior <denkenz@gmail.com>2010-02-08 11:54:03 -0600
committerDenis Kenzior <denkenz@gmail.com>2010-02-08 11:54:03 -0600
commit87ca1b0c8f4c5b441eb3209b2b0c867870596882 (patch)
tree1a0a79a975bd19f41768558b93af91c5e326d896 /src/ussd.c
parentc02dc9c68b47f93793ec9699069d0a77bcac3e12 (diff)
downloadofono-87ca1b0c8f4c5b441eb3209b2b0c867870596882.tar.bz2
Fix: Don't use ofono_debug directly in the core
Use DBG macro which is integrated with the new debug framework.
Diffstat (limited to 'src/ussd.c')
-rw-r--r--src/ussd.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ussd.c b/src/ussd.c
index 464664c4..df2e4b3c 100644
--- a/src/ussd.c
+++ b/src/ussd.c
@@ -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;