From 7ae98b3f2cf9fc3e0ab871741e6a11828621e976 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Thu, 5 Apr 2007 10:23:09 +0000 Subject: [PATCH] var types, use zize_t for lengths. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4856 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/libdingaling/src/libdingaling.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/libdingaling/src/libdingaling.c b/libs/libdingaling/src/libdingaling.c index f588a71855..8f3ea472f4 100644 --- a/libs/libdingaling/src/libdingaling.c +++ b/libs/libdingaling/src/libdingaling.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -72,6 +73,7 @@ #include "sha1.h" #ifdef _MSC_VER +#include #pragma warning(disable:4127 4706) #endif @@ -833,7 +835,10 @@ static ldl_avatar_t *ldl_get_avatar(ldl_handle_t *handle, char *path, char *from key = ldl_handle_strdup(handle, from); ldl_strip_resource(key); - b64encode((unsigned char *)image, bytes, base64, sizeof(base64)); + b64encode((unsigned char *)image, + bytes, + base64, + sizeof(base64)); ap->base64 = strdup(base64); apr_hash_set(globals.avatar_hash, ap->path, APR_HASH_KEY_STRING, ap); apr_hash_set(globals.avatar_hash, key, APR_HASH_KEY_STRING, ap); @@ -1080,10 +1085,10 @@ static int on_result(void *user_data, ikspak *pak) static const char c64[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; #define B64BUFFLEN 1024 -static int b64encode(unsigned char *in, uint32_t ilen, unsigned char *out, uint32_t olen) +static int b64encode(unsigned char *in, size_t ilen, unsigned char *out, size_t olen) { int y=0,bytes=0; - uint32_t x=0; + size_t x=0; unsigned int b=0,l=0; for(x=0;x