Open Source Telephony
 help / color / mirror / Atom feed
From: Yang Gu <yang.gu@intel.com>
To: ofono@ofono.org
Subject: [PATCH 10/11] Rename stk_icon_identifier to stk_icon_id
Date: Wed, 31 Mar 2010 17:17:02 +0800	[thread overview]
Message-ID: <1270027023-21468-10-git-send-email-yang.gu@intel.com> (raw)
In-Reply-To: <1270027023-21468-9-git-send-email-yang.gu@intel.com>

[-- Attachment #1: Type: text/plain, Size: 1942 bytes --]

---
 src/stkutil.c |    2 +-
 src/stkutil.h |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/stkutil.c b/src/stkutil.c
index 4c9cb6a..b830291 100644
--- a/src/stkutil.c
+++ b/src/stkutil.c
@@ -729,7 +729,7 @@ static gboolean parse_dataobj_call_control_requested_action(
 static gboolean parse_dataobj_icon_id(struct comprehension_tlv_iter *iter,
 					void *user)
 {
-	struct stk_icon_identifier *id = user;
+	struct stk_icon_id *id = user;
 	const unsigned char *data;
 
 	if (comprehension_tlv_iter_get_length(iter) != 2)
diff --git a/src/stkutil.h b/src/stkutil.h
index 3f2802e..4ff8c4b 100644
--- a/src/stkutil.h
+++ b/src/stkutil.h
@@ -442,7 +442,7 @@ struct stk_transaction_id {
  * Icon ID denotes a file on the SIM filesystem.  Since EF cannot have record
  * ids of 0, we use icon_id with 0 to denote empty icon_identifier objects
  */
-struct stk_icon_identifier {
+struct stk_icon_id {
 	unsigned char qualifier;
 	unsigned char id;
 };
@@ -471,7 +471,7 @@ struct stk_text_attribute {
 
 struct stk_command_display_text {
 	char *text;
-	struct stk_icon_identifier icon_id;
+	struct stk_icon_id icon_id;
 	ofono_bool_t immediate_response;
 	struct stk_duration duration;
 	struct stk_text_attribute text_attribute;
@@ -482,7 +482,7 @@ struct stk_command_get_input {
 	char *text;
 	struct stk_response_length response_length;
 	char *default_text;
-	struct stk_icon_identifier icon_id;
+	struct stk_icon_id icon_id;
 	struct stk_text_attribute text_attribute;
 	unsigned char frame_id; /* Values 0x10 to 0xFF reserved */
 };
@@ -491,7 +491,7 @@ struct stk_command_send_sms {
 	char *alpha_id;
 	struct stk_address address;
 	struct sms gsm_sms;
-	struct stk_icon_identifier icon_id;
+	struct stk_icon_id icon_id;
 	struct stk_text_attribute text_attribute;
 	unsigned char frame_id; /* Values 0x10 to 0xFF reserved */
 };
-- 
1.6.3.3


  reply	other threads:[~2010-03-31  9:17 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-31  9:16 [PATCH 01/11] Adjust the sequence of comprehension tlv structures Yang Gu
2010-03-31  9:16 ` [PATCH 02/11] Add parser for items next action indicator objects Yang Gu
2010-03-31  9:16   ` [PATCH 03/11] Add parser for event list objects Yang Gu
2010-03-31  9:16     ` [PATCH 04/11] Add parser for cause objects Yang Gu
2010-03-31  9:16       ` [PATCH 05/11] Add parser for location status objects Yang Gu
2010-03-31  9:16         ` [PATCH 06/11] Add parser for transaction identifier objects Yang Gu
2010-03-31  9:16           ` [PATCH 07/11] Add parser for call control requested action objects Yang Gu
2010-03-31  9:17             ` [PATCH 08/11] Add enum for icon qualifier Yang Gu
2010-03-31  9:17               ` [PATCH 09/11] Add parser for item icon identifier list objects Yang Gu
2010-03-31  9:17                 ` Yang Gu [this message]
2010-03-31  9:17                   ` [PATCH 11/11] Handle the comprehension tlv with bad format in parse_dataobj() Yang Gu
2010-03-31 17:25 ` [PATCH 01/11] Adjust the sequence of comprehension tlv structures Denis Kenzior

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1270027023-21468-10-git-send-email-yang.gu@intel.com \
    --to=yang.gu@intel.com \
    --cc=ofono@ofono.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox