From: Yang Gu <yang.gu@intel.com>
To: ofono@ofono.org
Subject: [PATCH 6/7] stkutil: Change some dataobj parser to use char * instead of char **
Date: Tue, 27 Apr 2010 17:47:11 +0800 [thread overview]
Message-ID: <1272361632-21352-6-git-send-email-yang.gu@intel.com> (raw)
In-Reply-To: <1272361632-21352-1-git-send-email-yang.gu@intel.com>
[-- Attachment #1: Type: text/plain, Size: 3654 bytes --]
---
src/stkutil.c | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/stkutil.c b/src/stkutil.c
index 2e0c957..a0166d0 100644
--- a/src/stkutil.c
+++ b/src/stkutil.c
@@ -611,7 +611,7 @@ static gboolean parse_dataobj_location_info(struct comprehension_tlv_iter *iter,
static gboolean parse_dataobj_imei(struct comprehension_tlv_iter *iter,
void *user)
{
- char **imei = user;
+ char *imei = user;
const unsigned char *data;
unsigned int len;
static const char digit_lut[] = "0123456789*#abc\0";
@@ -626,8 +626,8 @@ static gboolean parse_dataobj_imei(struct comprehension_tlv_iter *iter,
return FALSE;
/* Assume imei is at least 16 bytes long (15 for imei + null) */
- (*imei)[0] = digit_lut[(data[0] & 0xf0) >> 4];
- extract_bcd_number(data + 1, 7, *imei + 1);
+ imei[0] = digit_lut[(data[0] & 0xf0) >> 4];
+ extract_bcd_number(data + 1, 7, imei + 1);
return TRUE;
}
@@ -644,7 +644,7 @@ static gboolean parse_dataobj_help_request(struct comprehension_tlv_iter *iter,
static gboolean parse_dataobj_network_measurement_results(
struct comprehension_tlv_iter *iter, void *user)
{
- unsigned char **nmr = user;
+ unsigned char *nmr = user;
const unsigned char *data;
unsigned int len;
@@ -655,7 +655,7 @@ static gboolean parse_dataobj_network_measurement_results(
data = comprehension_tlv_iter_get_data(iter);
/* Assume network measurement result is 16 bytes long */
- memcpy(*nmr, data, len);
+ memcpy(nmr, data, len);
return TRUE;
}
@@ -1430,7 +1430,7 @@ static gboolean parse_dataobj_remote_entity_address(
static gboolean parse_dataobj_esn(struct comprehension_tlv_iter *iter,
void *user)
{
- unsigned char **esn = user;
+ unsigned char *esn = user;
const unsigned char *data;
unsigned int len = comprehension_tlv_iter_get_length(iter);
@@ -1440,7 +1440,7 @@ static gboolean parse_dataobj_esn(struct comprehension_tlv_iter *iter,
data = comprehension_tlv_iter_get_data(iter);
/* Assume esn is 4 bytes long */
- memcpy(*esn, data, len);
+ memcpy(esn, data, len);
return TRUE;
}
@@ -1528,7 +1528,7 @@ static gboolean parse_dataobj_item_text_attribute_list(
static gboolean parse_dataobj_imeisv(struct comprehension_tlv_iter *iter,
void *user)
{
- char **imeisv = user;
+ char *imeisv = user;
const unsigned char *data;
unsigned int len;
static const char digit_lut[] = "0123456789*#abc\0";
@@ -1546,10 +1546,10 @@ static gboolean parse_dataobj_imeisv(struct comprehension_tlv_iter *iter,
return FALSE;
/* Assume imeisv is at least 17 bytes long (16 for imeisv + null) */
- (*imeisv)[0] = digit_lut[data[0] >> 4];
- extract_bcd_number(data + 1, 7, *imeisv + 1);
- (*imeisv)[15] = digit_lut[data[8] & 0x0f];
- (*imeisv)[16] = '\0';
+ imeisv[0] = digit_lut[data[0] >> 4];
+ extract_bcd_number(data + 1, 7, imeisv + 1);
+ imeisv[15] = digit_lut[data[8] & 0x0f];
+ imeisv[16] = '\0';
return TRUE;
}
@@ -1656,7 +1656,7 @@ static gboolean parse_dataobj_frame_id(struct comprehension_tlv_iter *iter,
static gboolean parse_dataobj_meid(struct comprehension_tlv_iter *iter,
void *user)
{
- unsigned char **meid = user;
+ unsigned char *meid = user;
const unsigned char *data;
if (comprehension_tlv_iter_get_length(iter) != 8)
@@ -1665,7 +1665,7 @@ static gboolean parse_dataobj_meid(struct comprehension_tlv_iter *iter,
data = comprehension_tlv_iter_get_data(iter);
/* Assume meid is 8 bytes long */
- memcpy(*meid, data, 8);
+ memcpy(meid, data, 8);
return TRUE;
}
--
1.7.0.4
next prev parent reply other threads:[~2010-04-27 9:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-27 9:47 [PATCH 1/7] stkutil: Move advance of ctlv to parse_dataobj Yang Gu
2010-04-27 9:47 ` [PATCH 2/7] stkutil: Use struct to represent frame id Yang Gu
2010-04-27 9:47 ` [PATCH 3/7] test-stkutil: Refactor the implementation to test display text Yang Gu
2010-04-27 9:47 ` [PATCH 4/7] stkutil: Add parser for more time proactive commands Yang Gu
2010-04-27 9:47 ` [PATCH 5/7] test-stkutil: Add unit test for more time parser Yang Gu
2010-04-27 9:47 ` Yang Gu [this message]
2010-04-27 9:47 ` [PATCH 7/7] stkutil: Make get inkey parser use its own struct Yang Gu
2010-04-27 14:36 ` [PATCH 1/7] stkutil: Move advance of ctlv to parse_dataobj 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=1272361632-21352-6-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