diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-01-10 19:37:30 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-01-10 19:37:30 +0000 |
| commit | 9c1b53cab4b0e72c17f6054877ed0e2fe83c5367 (patch) | |
| tree | 5fa7148e89349c03cf597ea0e734db262bc278c8 /main/frame.c | |
| parent | 11e1780402816ca5aebd546c0297445348368b9b (diff) | |
According to POSIX, the capital L modifier applies only to floating point types.
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
Diffstat (limited to 'main/frame.c')
| -rw-r--r-- | main/frame.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/frame.c b/main/frame.c index fb4b4a478..1f1476c7c 100644 --- a/main/frame.c +++ b/main/frame.c @@ -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; } |