summaryrefslogtreecommitdiff
path: root/main/netsock.c
diff options
context:
space:
mode:
authorKinsey Moore <kmoore@digium.com>2014-05-09 22:49:26 +0000
committerKinsey Moore <kmoore@digium.com>2014-05-09 22:49:26 +0000
commitabd3e4040bd76058d0148884879858894258fb9f (patch)
treec5695a0880c4928731b1aa864f862c6cffa57428 /main/netsock.c
parentf3b55da1b855b12a59f84fd9bf6768eb101cd910 (diff)
Allow Asterisk to compile under GCC 4.10
This resolves a large number of compiler warnings from GCC 4.10 which cause the build to fail under dev mode. The vast majority are signed/unsigned mismatches in printf-style format strings. ........ Merged revisions 413586 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 413587 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 413588 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@413589 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/netsock.c')
-rw-r--r--main/netsock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/main/netsock.c b/main/netsock.c
index 18bf561f1..cf4c792af 100644
--- a/main/netsock.c
+++ b/main/netsock.c
@@ -211,10 +211,10 @@ char *ast_eid_to_str(char *s, int maxlen, struct ast_eid *eid)
*s = '\0';
} else {
for (x = 0; x < 5; x++) {
- sprintf(s, "%02x:", eid->eid[x]);
+ sprintf(s, "%02x:", (unsigned)eid->eid[x]);
s += 3;
}
- sprintf(s, "%02x", eid->eid[5]);
+ sprintf(s, "%02x", (unsigned)eid->eid[5]);
}
return os;
}
@@ -246,7 +246,7 @@ void ast_set_default_eid(struct ast_eid *eid)
/* Try pciX#[1..N] */
for (i = 0; i < MAXIF; i++) {
memset(&ifr, 0, sizeof(ifr));
- snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "pci%u#%u", x, i);
+ snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "pci%d#%u", x, i);
if (!ioctl(s, SIOCGIFHWADDR, &ifr)) {
break;
}