summaryrefslogtreecommitdiff
path: root/utils
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 /utils
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 'utils')
-rw-r--r--utils/astman.c2
-rw-r--r--utils/smsq.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/utils/astman.c b/utils/astman.c
index 3e9ca8ffb..315b3b065 100644
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -723,7 +723,7 @@ static int manager_login(char *hostname)
MD5Update(&md5, (unsigned char *)pass, strlen(pass));
MD5Final(digest, &md5);
for (x=0; x<16; x++)
- len += sprintf(md5key + len, "%2.2x", digest[x]);
+ len += sprintf(md5key + len, "%02hhx", digest[x]);
manager_action("Login",
"AuthType: MD5\r\n"
"Username: %s\r\n"
diff --git a/utils/smsq.c b/utils/smsq.c
index fab32f086..21ab80d04 100644
--- a/utils/smsq.c
+++ b/utils/smsq.c
@@ -390,14 +390,14 @@ static void rxqcheck (char *dir, char *queue, char *process)
{
for (n = 0, x = 0; x < udl; x++)
{
- sprintf (tmp + n, "%02X", ud[x]);
+ sprintf (tmp + n, "%02hX", ud[x]);
n += 2;
}
setenv ("ud8", tmp, 1);
}
for (n = 0, x = 0; x < udl; x++)
{
- sprintf (tmp + n, "%04X", ud[x]);
+ sprintf (tmp + n, "%04hX", ud[x]);
n += 4;
}
setenv ("ud16", tmp, 1);
@@ -730,13 +730,13 @@ main (int argc, const char *argv[])
{ /* use one byte hex */
fprintf (f, "ud#");
for (p = 0; p < udl; p++)
- fprintf (f, "%02X", ud[p]);
+ fprintf (f, "%02hX", ud[p]);
}
} else
{ /* use two byte hex */
fprintf (f, "ud##");
for (p = 0; p < udl; p++)
- fprintf (f, "%04X", ud[p]);
+ fprintf (f, "%04hX", ud[p]);
}
fprintf (f, "\n");
}