summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYang Gu <yang.gu@intel.com>2010-05-10 18:38:46 +0800
committerDenis Kenzior <denkenz@gmail.com>2010-05-11 12:19:09 -0500
commit6e4f5c5122c258fb90ee2198972b0627e6a02ec7 (patch)
treea89f569a3867905570eada5a601574b484d8597a /src
parent652e943c74fcfa662f84190ff2bae0d2ea9790f2 (diff)
downloadofono-6e4f5c5122c258fb90ee2198972b0627e6a02ec7.tar.bz2
stk: Unify variable names to use abbreviation
Diffstat (limited to 'src')
-rw-r--r--src/stkutil.c8
-rw-r--r--src/stkutil.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/stkutil.c b/src/stkutil.c
index 09fbec91..5bddb936 100644
--- a/src/stkutil.c
+++ b/src/stkutil.c
@@ -2095,7 +2095,7 @@ static gboolean parse_display_text(struct stk_command *command,
STK_DATA_OBJECT_TYPE_DURATION, 0,
&obj->duration,
STK_DATA_OBJECT_TYPE_TEXT_ATTRIBUTE, 0,
- &obj->text_attribute,
+ &obj->text_attr,
STK_DATA_OBJECT_TYPE_FRAME_ID, 0,
&obj->frame_id,
STK_DATA_OBJECT_TYPE_INVALID);
@@ -2169,13 +2169,13 @@ static gboolean parse_get_input(struct stk_command *command,
&obj->text,
STK_DATA_OBJECT_TYPE_RESPONSE_LENGTH,
DATAOBJ_FLAG_MANDATORY | DATAOBJ_FLAG_MINIMUM,
- &obj->response_length,
+ &obj->resp_len,
STK_DATA_OBJECT_TYPE_DEFAULT_TEXT, 0,
&obj->default_text,
STK_DATA_OBJECT_TYPE_ICON_ID, 0,
&obj->icon_id,
STK_DATA_OBJECT_TYPE_TEXT_ATTRIBUTE, 0,
- &obj->text_attribute,
+ &obj->text_attr,
STK_DATA_OBJECT_TYPE_FRAME_ID, 0,
&obj->frame_id,
STK_DATA_OBJECT_TYPE_INVALID);
@@ -2228,7 +2228,7 @@ static gboolean parse_send_sms(struct stk_command *command,
STK_DATA_OBJECT_TYPE_ICON_ID, 0,
&obj->icon_id,
STK_DATA_OBJECT_TYPE_TEXT_ATTRIBUTE, 0,
- &obj->text_attribute,
+ &obj->text_attr,
STK_DATA_OBJECT_TYPE_FRAME_ID, 0,
&obj->frame_id,
STK_DATA_OBJECT_TYPE_INVALID);
diff --git a/src/stkutil.h b/src/stkutil.h
index 41c03a75..70c6b019 100644
--- a/src/stkutil.h
+++ b/src/stkutil.h
@@ -794,7 +794,7 @@ struct stk_command_display_text {
struct stk_icon_id icon_id;
ofono_bool_t immediate_response;
struct stk_duration duration;
- struct stk_text_attribute text_attribute;
+ struct stk_text_attribute text_attr;
struct stk_frame_id frame_id;
};
@@ -808,10 +808,10 @@ struct stk_command_get_inkey {
struct stk_command_get_input {
char *text;
- struct stk_response_length response_length;
+ struct stk_response_length resp_len;
char *default_text;
struct stk_icon_id icon_id;
- struct stk_text_attribute text_attribute;
+ struct stk_text_attribute text_attr;
struct stk_frame_id frame_id;
};
@@ -820,7 +820,7 @@ struct stk_command_send_sms {
struct stk_address address;
struct sms gsm_sms;
struct stk_icon_id icon_id;
- struct stk_text_attribute text_attribute;
+ struct stk_text_attribute text_attr;
struct stk_frame_id frame_id;
};