kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-11 12:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow Asterisk to compile under GCC 4.10

Browse Source 
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.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@413586 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2014-05-09 22:18:59 +00:00
parent cb8877e720
commit 3e9a54d857
95 changed files with 553 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/frame.c
View File

@@ -719,8 +719,8 @@ static char *show_codecs(struct ast_cli_entry *e, int cmd, struct ast_cli_args *
}
}
snprintf(hex, sizeof(hex), "(0x%llx)", 1LL << i);
ast_cli(a->fd, "%19llu (1 << %2d) %20s %5s %8s (%s)\n", 1LL << i, i, hex,
snprintf(hex, sizeof(hex), "(0x%llx)", 1ULL << i);
ast_cli(a->fd, "%19llu (1 << %2d) %20s %5s %8s (%s)\n", 1ULL << i, i, hex,
((1LL << i) & AST_FORMAT_AUDIO_MASK) ? "audio" :
i == 16 || i == 17 ? "image" :
((1LL << i) & AST_FORMAT_VIDEO_MASK) ? "video" :
@@ -765,7 +765,7 @@ static char *show_codec_n(struct ast_cli_entry *e, int cmd, struct ast_cli_args
for (i = 0; i < 63; i++)
if (codec & (1LL << i)) {
found = 1;
ast_cli(a->fd, "%11llu (1 << %2d) %s\n", 1LL << i, i, ast_codec2str(1LL << i));
ast_cli(a->fd, "%11llu (1 << %2d) %s\n", 1ULL << i, i, ast_codec2str(1LL << i));
}
if (!found)
@@ -959,10 +959,10 @@ void ast_frame_dump(const char *name, struct ast_frame *f, char *prefix)
}
break;
default:
snprintf(ftype, sizeof(ftype), "Unknown Frametype '%d'", f->frametype);
snprintf(ftype, sizeof(ftype), "Unknown Frametype '%u'", f->frametype);
}
if (!ast_strlen_zero(moreinfo))
ast_verbose("%s [ TYPE: %s (%d) SUBCLASS: %s (%d) '%s' ] [%s]\n",
ast_verbose("%s [ TYPE: %s (%u) SUBCLASS: %s (%d) '%s' ] [%s]\n",
term_color(cp, prefix, COLOR_BRMAGENTA, COLOR_BLACK, sizeof(cp)),
term_color(cft, ftype, COLOR_BRRED, COLOR_BLACK, sizeof(cft)),
f->frametype,
@@ -971,7 +971,7 @@ void ast_frame_dump(const char *name, struct ast_frame *f, char *prefix)
term_color(cmn, moreinfo, COLOR_BRGREEN, COLOR_BLACK, sizeof(cmn)),
term_color(cn, name, COLOR_YELLOW, COLOR_BLACK, sizeof(cn)));
else
ast_verbose("%s [ TYPE: %s (%d) SUBCLASS: %s (%d) ] [%s]\n",
ast_verbose("%s [ TYPE: %s (%u) SUBCLASS: %s (%d) ] [%s]\n",
term_color(cp, prefix, COLOR_BRMAGENTA, COLOR_BLACK, sizeof(cp)),
term_color(cft, ftype, COLOR_BRRED, COLOR_BLACK, sizeof(cft)),
f->frametype,
@@ -1338,7 +1338,7 @@ static int g723_len(unsigned char buf)
return 20;
break;
default:
ast_log(LOG_WARNING, "Badly encoded frame (%d)\n", type);
ast_log(LOG_WARNING, "Badly encoded frame (%u)\n", type);
}
return -1;
}