mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
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 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@413588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user