From faf87444534b267c1e76c4398e4e4cbdb3927e75 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 5 Nov 2015 22:12:07 -0600 Subject: rilmodem: Implement ril_csca_set inline --- drivers/rilmodem/sms.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'drivers/rilmodem/sms.c') diff --git a/drivers/rilmodem/sms.c b/drivers/rilmodem/sms.c index 972695b8..51096d63 100644 --- a/drivers/rilmodem/sms.c +++ b/drivers/rilmodem/sms.c @@ -40,6 +40,7 @@ #include #include "smsutil.h" #include "util.h" +#include "common.h" #include "rilmodem.h" #include "grilrequest.h" @@ -74,14 +75,19 @@ static void ril_csca_set(struct ofono_sms *sms, struct sms_data *sd = ofono_sms_get_data(sms); struct cb_data *cbd = cb_data_new(cb, user_data, sd); struct parcel rilp; + const char *number = phone_number_to_string(sca); - g_ril_request_set_smsc_address(sd->ril, sca, &rilp); + parcel_init(&rilp); + parcel_w_string(&rilp, number); + + g_ril_append_print_buf(sd->ril, "(%s)", number); if (g_ril_send(sd->ril, RIL_REQUEST_SET_SMSC_ADDRESS, &rilp, - ril_csca_set_cb, cbd, g_free) == 0) { - g_free(cbd); - CALLBACK_WITH_FAILURE(cb, user_data); - } + ril_csca_set_cb, cbd, g_free) > 0) + return; + + g_free(cbd); + CALLBACK_WITH_FAILURE(cb, user_data); } static void ril_csca_query_cb(struct ril_msg *message, gpointer user_data) -- cgit v1.2.3