diff options
| author | Walter Doekes <walter+asterisk@wjd.nu> | 2014-12-17 10:23:32 +0000 |
|---|---|---|
| committer | Walter Doekes <walter+asterisk@wjd.nu> | 2014-12-17 10:23:32 +0000 |
| commit | 8b6ecc449c780eccc630ed8f3e3ca090f5a57b64 (patch) | |
| tree | 43b03098bd605892070fc93a70c74cc57e70c2a4 /res/res_pktccops.c | |
| parent | c4cc668ba9682751d8617d1f49932bcacf43772f (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 'res/res_pktccops.c')
| -rw-r--r-- | res/res_pktccops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/res_pktccops.c b/res/res_pktccops.c index e1d9d40e8..f2052a6d6 100644 --- a/res/res_pktccops.c +++ b/res/res_pktccops.c @@ -799,9 +799,9 @@ static void *do_pktccops(void *data) if ((idx = ast_poll_fd_index(pfds, nfds, cmts->sfd)) > -1 && (pfds[idx].revents & POLLIN)) { len = cops_getmsg(cmts->sfd, recmsg); if (len > 0) { - ast_debug(3, "COPS: got from %s:\n Header: versflag=0x%.2x opcode=%i clienttype=0x%.4x msglength=%u\n", - cmts->name, (unsigned)recmsg->verflag, - recmsg->opcode, (unsigned)recmsg->clienttype, recmsg->length); + ast_debug(3, "COPS: got from %s:\n Header: versflag=0x%02hhx opcode=%i clienttype=0x%04hx msglength=%u\n", + cmts->name, recmsg->verflag, + recmsg->opcode, recmsg->clienttype, recmsg->length); if (recmsg->object != NULL) { pobject = recmsg->object; while (pobject != NULL) { |