diff options
| author | Walter Doekes <walter+asterisk@wjd.nu> | 2014-12-17 09:54:00 +0000 |
|---|---|---|
| committer | Walter Doekes <walter+asterisk@wjd.nu> | 2014-12-17 09:54:00 +0000 |
| commit | 9ae57e0dd6841dad6930a75d7907d32a1efff4d2 (patch) | |
| tree | ee131dd37a2383d2be12aab71e5737db4292083a /apps/app_osplookup.c | |
| parent | a3534b7c0547db14c87f3f2622786a40374a74ee (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
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@429675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_osplookup.c')
| -rw-r--r-- | apps/app_osplookup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c index a576c966f..ef816c340 100644 --- a/apps/app_osplookup.c +++ b/apps/app_osplookup.c @@ -1425,7 +1425,9 @@ static int osp_uuid2str( int res; if ((uuid != NULL) && (bufsize > OSP_SIZE_UUIDSTR)) { - snprintf(buffer, bufsize, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", + snprintf(buffer, bufsize, "%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-" + "%02hhx%02hhx-%02hhx%02hhx-" + "%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx", uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], uuid[8], uuid[9], uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15]); res = OSP_OK; |