diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-13 21:25:10 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-13 21:25:10 +0000 |
| commit | 1e1095862dbfb7b0806ef2a31b1a914548b52ceb (patch) | |
| tree | bd4a3ebe7ebaab440e8bfb5016e2cd306e403300 /res | |
| parent | e160148695c99ec2d4ea29f53c8d067a6c2f89fe (diff) | |
x86-64 compile fixes and cleanups
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3202 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rwxr-xr-x | res/res_crypto.c | 4 | ||||
| -rwxr-xr-x | res/res_musiconhold.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/res/res_crypto.c b/res/res_crypto.c index e0cb6233c..2ebf4bef9 100755 --- a/res/res_crypto.c +++ b/res/res_crypto.c @@ -405,7 +405,7 @@ int ast_sign(struct ast_key *key, char *msg, char *sig) } if (siglen != sizeof(dsig)) { - ast_log(LOG_WARNING, "Unexpected signature length %d, expecting %d\n", siglen, sizeof(dsig)); + ast_log(LOG_WARNING, "Unexpected signature length %d, expecting %d\n", (int)siglen, (int)sizeof(dsig)); return -1; } @@ -431,7 +431,7 @@ int ast_check_signature(struct ast_key *key, char *msg, char *sig) /* Decode signature */ res = base64decode(dsig, sig, sizeof(dsig)); if (res != sizeof(dsig)) { - ast_log(LOG_WARNING, "Signature improper length (expect %d, got %d)\n", sizeof(dsig), res); + ast_log(LOG_WARNING, "Signature improper length (expect %d, got %d)\n", (int)sizeof(dsig), (int)res); return -1; } diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 27519a7ea..6bef3a6d6 100755 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -454,7 +454,7 @@ static int moh_generate(struct ast_channel *chan, void *data, int len, int sampl len = samples * 2; if (len > sizeof(buf) - AST_FRIENDLY_OFFSET) { - ast_log(LOG_WARNING, "Only doing %d of %d requested bytes on %s\n", sizeof(buf), len, chan->name); + ast_log(LOG_WARNING, "Only doing %d of %d requested bytes on %s\n", (int)sizeof(buf), (int)len, chan->name); len = sizeof(buf) - AST_FRIENDLY_OFFSET; } res = read(moh->pipe[0], buf + AST_FRIENDLY_OFFSET/2, len); |