clean up compiler warnings during build on 64-bit systems

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6059 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_readfile.c b/apps/app_readfile.c
index 733dd10..0930ec1 100755 (executable)
--- a/apps/app_readfile.c
+++ b/apps/app_readfile.c
@@ -83,7 +83,7 @@ static int readfile_exec(struct ast_channel *chan, void *data)
                if(len < strlen(returnvar))
                        returnvar[len]='\0';
                else
-                       ast_log(LOG_WARNING,"%s is longer than %d, and %d \n",file,len,strlen(returnvar));
+                       ast_log(LOG_WARNING,"%s is longer than %d, and %zd \n", file, len, strlen(returnvar));
        }
        pbx_builtin_setvar_helper(chan, varname, returnvar);
        free(returnvar);

diff --git a/apps/app_sms.c b/apps/app_sms.c
index d677ffb..8c2c430 100755 (executable)
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -1176,7 +1176,7 @@ static int sms_generate (struct ast_channel *chan, void *data, int len, int samp
        int i;
 
        if (len > sizeof (buf)) {
-               ast_log (LOG_WARNING, "Only doing %d bytes (%d bytes requested)\n", sizeof (buf) / sizeof (signed short), len);
+               ast_log (LOG_WARNING, "Only doing %zd bytes (%d bytes requested)\n", sizeof (buf) / sizeof (signed short), len);
                len = sizeof (buf);
 #ifdef OUTALAW
                samples = len;

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index dd20e1b..45d5db2 100755 (executable)
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -1944,7 +1944,7 @@ static int skinny_call(struct ast_channel *ast, char *dest, int timeout)
        if (ast->cid.cid_num) { 
                char ciddisplay[41];
                char *work;
-               int size = sizeof(ciddisplay);
+               size_t size = sizeof(ciddisplay);
 
                /* We'll assume that if it is 10 numbers, it is a standard NANPA number
                   Why? Because I am bloody American, and I'm bigoted that way. */

diff --git a/res/res_odbc.c b/res/res_odbc.c
index 14286b6..c670b71 100755 (executable)
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -426,7 +426,7 @@ odbc_status odbc_obj_disconnect(odbc_obj *obj)
 odbc_status odbc_obj_connect(odbc_obj *obj)
 {
        int res;
-       long int err;
+       int err;
        short int mlen;
        char msg[200], stat[10];
 
@@ -481,7 +481,7 @@ odbc_status odbc_obj_connect(odbc_obj *obj)
                SQLGetDiagRec(SQL_HANDLE_DBC, obj->con, 1, stat, &err, msg, 100, &mlen);
                SQLFreeHandle(SQL_HANDLE_ENV, obj->env);
                ast_mutex_unlock(&obj->lock);
-               ast_log(LOG_WARNING, "res_odbc: Error SQLConnect=%d errno=%ld %s\n", res, err, msg);
+               ast_log(LOG_WARNING, "res_odbc: Error SQLConnect=%d errno=%d %s\n", res, err, msg);
                return ODBC_FAIL;
        } else {