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 /apps/app_getcpeid.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 'apps/app_getcpeid.c')
| -rw-r--r-- | apps/app_getcpeid.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c index d0e62536d..319ed3cb9 100644 --- a/apps/app_getcpeid.c +++ b/apps/app_getcpeid.c @@ -87,9 +87,8 @@ static int cpeid_exec(struct ast_channel *chan, const char *idata) res = ast_adsi_get_cpeid(chan, cpeid, 0); if (res > 0) { gotcpeid = 1; - ast_verb(3, "Got CPEID of '%02x:%02x:%02x:%02x' on '%s'\n", - (unsigned)cpeid[0], (unsigned)cpeid[1], (unsigned)cpeid[2], - (unsigned)cpeid[3], ast_channel_name(chan)); + ast_verb(3, "Got CPEID of '%02hhx:%02hhx:%02hhx:%02hhx' on '%s'\n", + cpeid[0], cpeid[1], cpeid[2], cpeid[3], ast_channel_name(chan)); } if (res > -1) { strcpy(data[1], "Measuring CPE..."); @@ -103,9 +102,8 @@ static int cpeid_exec(struct ast_channel *chan, const char *idata) } if (res > -1) { if (gotcpeid) - snprintf(data[1], 80, "CPEID: %02x:%02x:%02x:%02x", - (unsigned)cpeid[0], (unsigned)cpeid[1], - (unsigned)cpeid[2], (unsigned)cpeid[3]); + snprintf(data[1], 80, "CPEID: %02hhx:%02hhx:%02hhx:%02hhx", + cpeid[0], cpeid[1], cpeid[2], cpeid[3]); else strcpy(data[1], "CPEID Unknown"); if (gotgeometry) |