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 /channels/sig_pri.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 'channels/sig_pri.c')
| -rw-r--r-- | channels/sig_pri.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/channels/sig_pri.c b/channels/sig_pri.c index a26b56611..37d3e49c7 100644 --- a/channels/sig_pri.c +++ b/channels/sig_pri.c @@ -754,15 +754,15 @@ static void sig_pri_set_subaddress(struct ast_party_subaddress *ast_subaddress, ptr = cnum; len = pri_subaddress->length - 1; /* -1 account for zero based indexing */ for (x = 0; x < len; ++x) { - ptr += sprintf(ptr, "%02x", (unsigned)pri_subaddress->data[x]); + ptr += sprintf(ptr, "%02hhx", (unsigned char)pri_subaddress->data[x]); } if (pri_subaddress->odd_even_indicator) { /* ODD */ - sprintf(ptr, "%01x", (unsigned)((pri_subaddress->data[len]) >> 4)); + sprintf(ptr, "%01hhx", (unsigned char)((pri_subaddress->data[len]) >> 4)); } else { /* EVEN */ - sprintf(ptr, "%02x", (unsigned)pri_subaddress->data[len]); + sprintf(ptr, "%02hhx", (unsigned char)pri_subaddress->data[len]); } ast_subaddress->str = cnum; } @@ -8083,7 +8083,7 @@ int sig_pri_call(struct sig_pri_chan *p, struct ast_channel *ast, const char *rd if (p->pri->facilityenable) pri_facility_enable(p->pri->pri); - ast_verb(3, "Requested transfer capability: 0x%.2x - %s\n", (unsigned)ast_channel_transfercapability(ast), ast_transfercapability2str(ast_channel_transfercapability(ast))); + ast_verb(3, "Requested transfer capability: 0x%02hx - %s\n", ast_channel_transfercapability(ast), ast_transfercapability2str(ast_channel_transfercapability(ast))); dp_strip = 0; pridialplan = p->pri->dialplan - 1; if (pridialplan == -2 || pridialplan == -3) { /* compute dynamically */ |