From b6c3cd5d6457ab8fc5e5657a85ba5eb5b58a077a Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 5 Nov 2015 12:48:59 -0600 Subject: gril: Remove g_ril_unsol_parse_ussd and related --- gril/grilunsol.c | 55 ------------------------------------------------------- gril/grilunsol.h | 9 --------- 2 files changed, 64 deletions(-) diff --git a/gril/grilunsol.c b/gril/grilunsol.c index 9fd89003..4f0472f4 100644 --- a/gril/grilunsol.c +++ b/gril/grilunsol.c @@ -581,58 +581,3 @@ struct unsol_supp_svc_notif *g_ril_unsol_parse_supp_svc_notif(GRil *gril, return unsol; } - -void g_ril_unsol_free_ussd(struct unsol_ussd *unsol) -{ - if (unsol != NULL) { - g_free(unsol->message); - g_free(unsol); - } -} - -struct unsol_ussd *g_ril_unsol_parse_ussd(GRil *gril, struct ril_msg *message) -{ - struct parcel rilp; - struct unsol_ussd *ussd; - char *typestr = NULL; - int numstr; - - ussd = g_try_malloc0(sizeof(*ussd)); - if (ussd == NULL) { - ofono_error("%s out of memory", __func__); - goto error; - } - - g_ril_init_parcel(message, &rilp); - - numstr = parcel_r_int32(&rilp); - if (numstr < 1) { - ofono_error("%s malformed parcel", __func__); - goto error; - } - - typestr = parcel_r_string(&rilp); - if (typestr == NULL || *typestr == '\0') { - ofono_error("%s wrong type", __func__); - goto error; - } - - ussd->type = *typestr - '0'; - - g_free(typestr); - - if (numstr > 1) - ussd->message = parcel_r_string(&rilp); - - g_ril_append_print_buf(gril, "{%d,%s}", ussd->type, ussd->message); - - g_ril_print_unsol(gril, message); - - return ussd; - -error: - g_free(typestr); - g_free(ussd); - - return NULL; -} diff --git a/gril/grilunsol.h b/gril/grilunsol.h index a7ddfc94..829b8579 100644 --- a/gril/grilunsol.h +++ b/gril/grilunsol.h @@ -59,11 +59,6 @@ struct unsol_supp_svc_notif { struct ofono_phone_number number; }; -struct unsol_ussd { - int type; - char *message; -}; - void g_ril_unsol_free_data_call_list(struct ril_data_call_list *data_call_list); @@ -88,10 +83,6 @@ void g_ril_unsol_free_supp_svc_notif(struct unsol_supp_svc_notif *unsol); struct unsol_supp_svc_notif *g_ril_unsol_parse_supp_svc_notif(GRil *gril, struct ril_msg *message); -void g_ril_unsol_free_ussd(struct unsol_ussd *unsol); - -struct unsol_ussd *g_ril_unsol_parse_ussd(GRil *gril, struct ril_msg *message); - #ifdef __cplusplus } #endif -- cgit v1.2.3