From 1ee79f04686d1db468050d9b3b11537b970941b0 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Wed, 4 Nov 2015 21:45:15 -0600 Subject: [PATCH] gril: Remove g_ril_reply_parse_get_clir & related --- gril/grilreply.c | 44 -------------------------------------------- gril/grilreply.h | 10 ---------- 2 files changed, 54 deletions(-) diff --git a/gril/grilreply.c b/gril/grilreply.c index 37a3473a..df24f7ce 100644 --- a/gril/grilreply.c +++ b/gril/grilreply.c @@ -981,50 +981,6 @@ char *g_ril_reply_parse_get_imei(GRil *gril, return imei; } -void g_ril_reply_free_get_clir(struct reply_clir *rclir) -{ - g_free(rclir); -} - -struct reply_clir *g_ril_reply_parse_get_clir(GRil *gril, - const struct ril_msg *message) -{ - struct parcel rilp; - struct reply_clir *rclir; - int numint; - - rclir = g_try_malloc0(sizeof(*rclir)); - if (rclir == NULL) { - ofono_error("%s Out of memory", __func__); - goto error; - } - - g_ril_init_parcel(message, &rilp); - - /* Length */ - numint = parcel_r_int32(&rilp); - if (numint != 2) { - ofono_error("%s Wrong format", __func__); - goto error; - } - - /* Set HideCallerId property from network */ - rclir->status = parcel_r_int32(&rilp); - - /* State of the CLIR supplementary service in the network */ - rclir->provisioned = parcel_r_int32(&rilp); - - g_ril_append_print_buf(gril, "{%d,%d}", - rclir->status, rclir->provisioned); - g_ril_print_response(gril, message); - - return rclir; - -error: - g_free(rclir); - return NULL; -} - struct ofono_call_forwarding_condition *g_ril_reply_parse_query_call_fwd(GRil *gril, const struct ril_msg *message, diff --git a/gril/grilreply.h b/gril/grilreply.h index 464f7bb3..fbbb4bea 100644 --- a/gril/grilreply.h +++ b/gril/grilreply.h @@ -87,11 +87,6 @@ struct reply_sim_status { struct reply_sim_app *apps[MAX_UICC_APPS]; }; -struct reply_clir { - int status; - int provisioned; -}; - struct reply_oem_hook { int length; void *data; @@ -142,11 +137,6 @@ char *g_ril_reply_parse_baseband_version(GRil *gril, char *g_ril_reply_parse_get_imei(GRil *gril, const struct ril_msg *message); -void g_ril_reply_free_get_clir(struct reply_clir *rclir); - -struct reply_clir *g_ril_reply_parse_get_clir(GRil *gril, - const struct ril_msg *message); - struct ofono_call_forwarding_condition *g_ril_reply_parse_query_call_fwd(GRil *gril, const struct ril_msg *message,