From 6a6f7bed3cfe54c227b6a179f516fc75a43797fb Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Thu, 25 Nov 2010 12:51:03 +0200 Subject: [PATCH] isi: Remove stray newlines in messages sent to log --- drivers/isimodem/call-barring.c | 10 +++++----- drivers/isimodem/call-forwarding.c | 8 ++++---- drivers/isimodem/call-settings.c | 8 ++++---- drivers/isimodem/cbs.c | 2 +- drivers/isimodem/sms.c | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/isimodem/call-barring.c b/drivers/isimodem/call-barring.c index 2a982f9..7cdd218 100644 --- a/drivers/isimodem/call-barring.c +++ b/drivers/isimodem/call-barring.c @@ -125,7 +125,7 @@ static void isi_set(struct ofono_call_barring *barr, const char *lock, 0, 0 /* Filler */ }; - DBG("lock code %s enable %d class %d password %s\n", + DBG("lock code %s enable %d class %d password %s", lock, enable, cls, passwd); if (!cbd || !bd) @@ -177,7 +177,7 @@ static void update_status_mask(unsigned int *mask, int bsc) break; default: - DBG("Unknown BSC: 0x%04X\n", bsc); + DBG("Unknown BSC: 0x%04X", bsc); break; } } @@ -244,7 +244,7 @@ static gboolean query_resp_cb(GIsiClient *client, } } - DBG("mask=0x%04X\n", mask); + DBG("mask=0x%04X", mask); CALLBACK_WITH_SUCCESS(cb, mask, cbd->data); goto out; @@ -273,7 +273,7 @@ static void isi_query(struct ofono_call_barring *barr, const char *lock, 0 /* Subblock count */ }; - DBG("barring query lock code %s\n", lock); + DBG("barring query lock code %s", lock); if (!cbd || !bd) goto error; @@ -343,7 +343,7 @@ static void isi_set_passwd(struct ofono_call_barring *barr, const char *lock, 0, 0 /* Filler */ }; - DBG("lock code %s (%u) old password %s new password %s\n", + DBG("lock code %s (%u) old password %s new password %s", lock, ss_code, old_passwd, new_passwd); if (!cbd || !bd) diff --git a/drivers/isimodem/call-forwarding.c b/drivers/isimodem/call-forwarding.c index 1448451..bb25ee7 100644 --- a/drivers/isimodem/call-forwarding.c +++ b/drivers/isimodem/call-forwarding.c @@ -70,7 +70,7 @@ static int forw_type_to_isi_code(int type) ss_code = SS_GSM_ALL_COND_FORWARDINGS; break; default: - DBG("Unknown forwarding type %d\n", type); + DBG("Unknown forwarding type %d", type); ss_code = -1; break; } @@ -227,7 +227,7 @@ static void isi_registration(struct ofono_call_forwarding *cf, /* Followed by number in UCS-2, zero sub address bytes, and 0 * to 3 bytes of filler */ - DBG("forwarding type %d class %d\n", type, cls); + DBG("forwarding type %d class %d", type, cls); if (!cbd || !fd || !number->number || strlen(number->number) > 28) goto error; @@ -347,7 +347,7 @@ static void isi_erasure(struct ofono_call_forwarding *cf, int type, int cls, 0 /* Subblock count */ }; - DBG("forwarding type %d class %d\n", type, cls); + DBG("forwarding type %d class %d", type, cls); if (!cbd || !fd) goto error; @@ -479,7 +479,7 @@ static void isi_query(struct ofono_call_forwarding *cf, int type, int cls, 0 /* Subblock count */ }; - DBG("forwarding type %d class %d\n", type, cls); + DBG("forwarding type %d class %d", type, cls); if (!cbd || !fd || cls != 7) goto error; diff --git a/drivers/isimodem/call-settings.c b/drivers/isimodem/call-settings.c index c845d54..23c1982 100644 --- a/drivers/isimodem/call-settings.c +++ b/drivers/isimodem/call-settings.c @@ -84,7 +84,7 @@ static void update_status_mask(unsigned int *mask, int bsc) break; default: - DBG("Unknown BSC value %d, please report\n", bsc); + DBG("Unknown BSC value %d, please report", bsc); break; } } @@ -146,7 +146,7 @@ static gboolean query_resp_cb(GIsiClient *client, } } - DBG("status_mask %d\n", mask); + DBG("status_mask %d", mask); CALLBACK_WITH_SUCCESS(cb, mask, cbd->data); goto out; @@ -175,7 +175,7 @@ static void isi_cw_query(struct ofono_call_settings *cs, int cls, 0 /* Subblock count */ }; - DBG("waiting class %d\n", cls); + DBG("waiting class %d", cls); if (!cbd || !sd) goto error; @@ -266,7 +266,7 @@ static void isi_cw_set(struct ofono_call_settings *cs, int mode, int cls, 0 /* Subblock count */ }; - DBG("waiting mode %d class %d\n", mode, cls); + DBG("waiting mode %d class %d", mode, cls); if (!cbd || !sd) goto error; diff --git a/drivers/isimodem/cbs.c b/drivers/isimodem/cbs.c index dec8154..2a32720 100644 --- a/drivers/isimodem/cbs.c +++ b/drivers/isimodem/cbs.c @@ -104,7 +104,7 @@ static gboolean routing_resp_cb(GIsiClient *client, "It appears some other component is " "already\n registered as the CBS " "routing endpoint.\n As a consequence, " - "receiving CBSs is NOT going to work.\n\n", + "receiving CBSs is NOT going to work.\n", msg[1], sms_isi_cause_name(msg[1])); return TRUE; } diff --git a/drivers/isimodem/sms.c b/drivers/isimodem/sms.c index 319eb54..e2c2533 100644 --- a/drivers/isimodem/sms.c +++ b/drivers/isimodem/sms.c @@ -524,7 +524,7 @@ static gboolean routing_resp_cb(GIsiClient *client, "already\n registered as the SMS " "routing endpoint.\n As a consequence, " "receiving SMSs is NOT going to work.\n " - "On the other hand, sending might work.\n\n", + "On the other hand, sending might work.\n", msg[1], sms_isi_cause_name(msg[1])); ofono_sms_register(sms); } -- 2.7.4