summaryrefslogtreecommitdiff
path: root/channels/misdn
diff options
context:
space:
mode:
authorWalter Doekes <walter+asterisk@wjd.nu>2014-12-17 10:23:32 +0000
committerWalter Doekes <walter+asterisk@wjd.nu>2014-12-17 10:23:32 +0000
commit8b6ecc449c780eccc630ed8f3e3ca090f5a57b64 (patch)
tree43b03098bd605892070fc93a70c74cc57e70c2a4 /channels/misdn
parentc4cc668ba9682751d8617d1f49932bcacf43772f (diff)
Fix printf problems with high ascii characters after r413586 (1.8).
In r413586 (1.8) various casts were added to silence gcc 4.10 warnings. Those fixes included things like: -out += sprintf(out, "%%%02X", (unsigned char) *ptr); +out += sprintf(out, "%%%02X", (unsigned) *ptr); That works for low ascii characters, but for the high range that yields e.g. FFFFFFC3 when C3 is expected. This changeset: - fixes those casts to use the 'hh' unsigned char modifier instead - consistently uses %02x instead of %2.2x (or other non-standard usage) - adds a few 'h' modifiers in various places - fixes a 'replcaes' typo - dev/urandon typo (in 13+ patch) Review: https://reviewboard.asterisk.org/r/4263/ ASTERISK-24619 #close Reported by: Stefan27 (on IRC) ........ Merged revisions 429673 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 429674 from http://svn.asterisk.org/svn/asterisk/branches/12 ........ Merged revisions 429675 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@429683 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/misdn')
-rw-r--r--channels/misdn/ie.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/channels/misdn/ie.c b/channels/misdn/ie.c
index 74ae897de..df5df9afe 100644
--- a/channels/misdn/ie.c
+++ b/channels/misdn/ie.c
@@ -293,7 +293,7 @@ static void enc_ie_call_id(unsigned char **ntmode, msg_t *msg, char *callid, int
i = 0;
while(i < callid_len)
{
- if (MISDN_IE_DEBG) printf(debug+(i*3), " %02x", callid[i]);
+ if (MISDN_IE_DEBG) printf(debug+(i*3), " %02hhx", (unsigned char)callid[i]);
i++;
}
@@ -339,7 +339,7 @@ static void dec_ie_call_id(unsigned char *p, Q931_info_t *qi, char *callid, int
i = 0;
while(i < *callid_len)
{
- if (MISDN_IE_DEBG) printf(debug+(i*3), " %02x", callid[i]);
+ if (MISDN_IE_DEBG) printf(debug+(i*3), " %02hhx", (unsigned char)callid[i]);
i++;
}
@@ -745,7 +745,7 @@ static void enc_ie_channel_id(unsigned char **ntmode, msg_t *msg, int exclusive,
p[0] = IE_CHANNEL_ID;
p[1] = l;
p[2] = 0x80 + 0x20 + 0x03;
-/* if (MISDN_IE_DEBG) printf("%02x\n", p[2]); */
+/* if (MISDN_IE_DEBG) printf("%02hhx\n", p[2]); */
return; /* end */
}
l = 3;
@@ -759,7 +759,7 @@ static void enc_ie_channel_id(unsigned char **ntmode, msg_t *msg, int exclusive,
p[2] = 0x80 + 0x20 + (exclusive<<3) + 0x01;
p[3] = 0x80 + 3; /* CCITT, Number, B-type */
p[4] = 0x80 + channel;
-/* if (MISDN_IE_DEBG) printf("%02x %02x %02x\n", p[2], p[3], p[4]); */
+/* if (MISDN_IE_DEBG) printf("%02hhx %02hhx %02hhx\n", p[2], p[3], p[4]); */
}
}
@@ -849,7 +849,7 @@ static void dec_ie_channel_id(unsigned char *p, Q931_info_t *qi, int *exclusive,
printf("%s: ERROR: PRI interface channel out of range (%d).\n", __FUNCTION__, *channel);
return;
}
-/* if (MISDN_IE_DEBG) printf("%02x %02x %02x\n", p[1], p[2], p[3]); */
+/* if (MISDN_IE_DEBG) printf("%02hhx %02hhx %02hhx\n", p[1], p[2], p[3]); */
}
if (MISDN_IE_DEBG) printf(" exclusive=%d channel=%d\n", *exclusive, *channel);
@@ -1342,7 +1342,7 @@ static void enc_ie_useruser(unsigned char **ntmode, msg_t *msg, int protocol, ch
char debug[768];
for (i = 0; i < user_len; ++i) {
- sprintf(debug + (i * 3), " %02x", user[i]);
+ sprintf(debug + (i * 3), " %02hhx", (unsigned char)user[i]);
}
debug[i * 3] = 0;
printf(" protocol=%d user-user%s\n", protocol, debug);
@@ -1387,7 +1387,7 @@ static void dec_ie_useruser(unsigned char *p, Q931_info_t *qi, int *protocol, ch
char debug[768];
for (i = 0; i < *user_len; ++i) {
- sprintf(debug + (i * 3), " %02x", user[i]);
+ sprintf(debug + (i * 3), " %02hhx", (unsigned char)user[i]);
}
debug[i * 3] = 0;
printf(" protocol=%d user-user%s\n", *protocol, debug);