adjust return length for ticket #1591 (Erin Yueh)
git-svn-id: http://svn.openmoko.org/trunk/src/target/gsm@4618 99fdad57-331a-0410-800a-d7fa5415bdb3
This commit is contained in:
parent
45973084b2
commit
d822e692f1
|
@ -290,9 +290,11 @@ int packing_7bit_character(const char *src, struct lgsm_sms *dest)
|
||||||
int unpacking_7bit_character(const struct gsmd_sms *src, char *dest)
|
int unpacking_7bit_character(const struct gsmd_sms *src, char *dest)
|
||||||
{
|
{
|
||||||
int i = 0;
|
int i = 0;
|
||||||
|
int l = 0;
|
||||||
|
|
||||||
if (src->has_header)
|
if (src->has_header)
|
||||||
i += ((src->data[0] << 3) + 14) / 7;
|
l += ((src->data[0] << 3) + 14) / 7;
|
||||||
|
i += l;
|
||||||
for (; i < src->length; i ++)
|
for (; i < src->length; i ++)
|
||||||
*(dest ++) =
|
*(dest ++) =
|
||||||
((src->data[(i * 7 + 7) >> 3] <<
|
((src->data[(i * 7 + 7) >> 3] <<
|
||||||
|
@ -301,7 +303,7 @@ int unpacking_7bit_character(const struct gsmd_sms *src, char *dest)
|
||||||
((i * 7) & 7))) & 0x7f;
|
((i * 7) & 7))) & 0x7f;
|
||||||
*dest = '\0';
|
*dest = '\0';
|
||||||
|
|
||||||
return i;
|
return i - l;
|
||||||
}
|
}
|
||||||
|
|
||||||
int cbm_unpacking_7bit_character(const char *src, char *dest)
|
int cbm_unpacking_7bit_character(const char *src, char *dest)
|
||||||
|
|
Loading…
Reference in New Issue