kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 15:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

According to POSIX, the capital L modifier applies only to floating point types.

Browse Source 
Fixes a crash on Solaris.
(closes issue #16572)
 Reported by: crjw
 Patches: 
       frame_changes.patch uploaded by crjw (license 963)
       Plus several others found and fixed by me


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@239074 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-01-10 19:37:30 +00:00
parent 11e1780402
commit 9c1b53cab4
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/frame.c
View File

@@ -703,8 +703,8 @@ static char *show_codecs(struct ast_cli_entry *e, int cmd, struct ast_cli_args *
}
}
snprintf(hex, sizeof(hex), "(0x%Lx)", 1LL << i);
ast_cli(a->fd, "%19Lu (1 << %2d) %20s %5s %8s (%s)\n", 1LL << i, i, hex,
snprintf(hex, sizeof(hex), "(0x%llx)", 1LL << i);
ast_cli(a->fd, "%19llu (1 << %2d) %20s %5s %8s (%s)\n", 1LL << i, i, hex,
((1LL << i) & AST_FORMAT_AUDIO_MASK) ? "audio" :
i == 16 || i == 17 ? "image" :
((1LL << i) & AST_FORMAT_VIDEO_MASK) ? "video" :
@@ -741,7 +741,7 @@ static char *show_codec_n(struct ast_cli_entry *e, int cmd, struct ast_cli_args
if (a->argc != 4)
return CLI_SHOWUSAGE;
if (sscanf(a->argv[3], "%30Ld", &type_punned_codec) != 1) {
if (sscanf(a->argv[3], "%30lld", &type_punned_codec) != 1) {
return CLI_SHOWUSAGE;
}
codec = type_punned_codec;
@@ -749,11 +749,11 @@ 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, "%11Lu (1 << %2d) %s\n", 1LL << i, i, ast_codec2str(1LL << i));
ast_cli(a->fd, "%11llu (1 << %2d) %s\n", 1LL << i, i, ast_codec2str(1LL << i));
}
if (!found)
ast_cli(a->fd, "Codec %Ld not found\n", (long long) codec);
ast_cli(a->fd, "Codec %lld not found\n", (long long) codec);
return CLI_SUCCESS;
}