From 5482a778f9574c2cf3d941d5065bad58a30d79cc Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Tue, 11 Feb 2014 16:49:56 +0100 Subject: Extract in helpers naming Signed-off-by: Paul Kocialkowski --- include/call.h | 7 +++---- include/misc.h | 2 +- include/sec.h | 2 +- samsung-ipc/call.c | 11 ++++------- samsung-ipc/misc.c | 2 +- samsung-ipc/sec.c | 2 +- 6 files changed, 11 insertions(+), 15 deletions(-) diff --git a/include/call.h b/include/call.h index 92cb563..af8effa 100644 --- a/include/call.h +++ b/include/call.h @@ -140,11 +140,10 @@ struct ipc_call_cont_dtmf_data { int ipc_call_outgoing_setup(struct ipc_call_outgoing_data *data, unsigned char type, unsigned char identity, unsigned char prefix, const char *number); -unsigned char ipc_call_list_get_count(const void *data, size_t size); -struct ipc_call_list_entry *ipc_call_list_get_entry(const void *data, - size_t size, unsigned int index); -char *ipc_call_list_get_entry_number(const void *data, +unsigned char ipc_call_list_count_extract(const void *data, size_t size); +struct ipc_call_list_entry *ipc_call_list_entry_extract(const void *data, size_t size, unsigned int index); +char *ipc_call_list_entry_number_extract(const struct ipc_call_list_entry *entry); void *ipc_call_burst_dtmf_setup(const struct ipc_call_burst_dtmf_entry *entries, unsigned char count); diff --git a/include/misc.h b/include/misc.h index f40b1f0..ad1afad 100644 --- a/include/misc.h +++ b/include/misc.h @@ -77,7 +77,7 @@ struct ipc_misc_time_info_data { * Helpers */ -char *ipc_misc_me_imsi_get_imsi(const void *data, size_t size); +char *ipc_misc_me_imsi_imsi_extract(const void *data, size_t size); #endif diff --git a/include/sec.h b/include/sec.h index 48968e9..c35ed69 100644 --- a/include/sec.h +++ b/include/sec.h @@ -173,7 +173,7 @@ int ipc_sec_phone_lock_request_set_setup(struct ipc_sec_phone_lock_request_set_d int ipc_sec_change_locking_pw_setup(struct ipc_sec_change_locking_pw_data *data, unsigned char facility_type, const char *password_old, const char *password_new); -void *ipc_sec_rsim_access_get_file_data(const void *data, size_t size); +void *ipc_sec_rsim_access_file_data_extract(const void *data, size_t size); int ipc_sec_lock_infomation_setup(struct ipc_sec_lock_infomation_request_data *data, unsigned char type); diff --git a/samsung-ipc/call.c b/samsung-ipc/call.c index ba7097e..2830c46 100644 --- a/samsung-ipc/call.c +++ b/samsung-ipc/call.c @@ -47,7 +47,7 @@ int ipc_call_outgoing_setup(struct ipc_call_outgoing_data *data, return 0; } -unsigned char ipc_call_list_get_count(const void *data, size_t size) +unsigned char ipc_call_list_count_extract(const void *data, size_t size) { struct ipc_call_list_header *header; @@ -59,7 +59,7 @@ unsigned char ipc_call_list_get_count(const void *data, size_t size) return header->count; } -struct ipc_call_list_entry *ipc_call_list_get_entry(const void *data, +struct ipc_call_list_entry *ipc_call_list_entry_extract(const void *data, size_t size, unsigned int index) { struct ipc_call_list_entry *entry = NULL; @@ -70,7 +70,7 @@ struct ipc_call_list_entry *ipc_call_list_get_entry(const void *data, if (data == NULL) return NULL; - count = ipc_call_list_get_count(data, size); + count = ipc_call_list_count_extract(data, size); if (count == 0) return NULL; @@ -87,14 +87,11 @@ struct ipc_call_list_entry *ipc_call_list_get_entry(const void *data, return entry; } -char *ipc_call_list_get_entry_number(const void *data, - size_t size, unsigned int index) +char *ipc_call_list_entry_number_extract(const struct ipc_call_list_entry *entry) { - struct ipc_call_list_entry *entry; char *number; size_t number_length; - entry = ipc_call_list_get_entry(data, size, index); if (entry == NULL) return NULL; diff --git a/samsung-ipc/misc.c b/samsung-ipc/misc.c index f36403e..b766b3c 100644 --- a/samsung-ipc/misc.c +++ b/samsung-ipc/misc.c @@ -23,7 +23,7 @@ #include -char *ipc_misc_me_imsi_get_imsi(const void *data, size_t size) +char *ipc_misc_me_imsi_imsi_extract(const void *data, size_t size) { struct ipc_misc_me_imsi_header *header; char *imsi; diff --git a/samsung-ipc/sec.c b/samsung-ipc/sec.c index 9017cb9..c25dd9e 100644 --- a/samsung-ipc/sec.c +++ b/samsung-ipc/sec.c @@ -117,7 +117,7 @@ int ipc_sec_change_locking_pw_setup(struct ipc_sec_change_locking_pw_data *data, return 0; } -void *ipc_sec_rsim_access_get_file_data(const void *data, size_t size) +void *ipc_sec_rsim_access_file_data_extract(const void *data, size_t size) { struct ipc_sec_rsim_access_response_header *header; void *file_data; -- cgit v1.1