summaryrefslogtreecommitdiff
path: root/channels/vcodecs.c
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/vcodecs.c
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/vcodecs.c')
-rw-r--r--channels/vcodecs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/vcodecs.c b/channels/vcodecs.c
index 72c7fa9c2..76aeb671f 100644
--- a/channels/vcodecs.c
+++ b/channels/vcodecs.c
@@ -209,9 +209,9 @@ void dump_buf(struct fbuf_t *b)
if (i != 0)
ast_log(LOG_WARNING, "%s\n", buf);
memset(buf, '\0', sizeof(buf));
- sprintf(buf, "%04x: ", i);
+ sprintf(buf, "%04x: ", (unsigned)i);
}
- sprintf(buf + 6 + x*3, "%02x ", b->data[i]);
+ sprintf(buf + 6 + x*3, "%02hhx ", b->data[i]);
if (i > 31 && i < last2lines)
i = last2lines - 1;
}
@@ -1056,7 +1056,7 @@ static int h264_decap(struct fbuf_t *b, uint8_t *data, int len)
}
/* first of all, check if the packet has F == 0 */
if (data[0] & 0x80) {
- ast_log(LOG_WARNING, "--- forbidden packet; nal: %02x\n",
+ ast_log(LOG_WARNING, "--- forbidden packet; nal: %02hhx\n",
data[0]);
return 1;
}