generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix compiler warning

Browse Source
This commit is contained in:
Yang Tse
2010-02-21 19:59:09 +00:00
parent 25a49ccd21
commit 10affed097
3 changed files with 54 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ares/ares_data.c
View File

@@ -45,8 +45,18 @@ void ares_free_data(void *dataptr)
if (!dataptr) if (!dataptr)
return; return;
#ifdef __INTEL_COMPILER
# pragma warning(push)
# pragma warning(disable:1684)
/* 1684: conversion from pointer to same-sized integral type */
#endif
ptr = (void *)((char *)dataptr - offsetof(struct ares_data, data)); ptr = (void *)((char *)dataptr - offsetof(struct ares_data, data));
#ifdef __INTEL_COMPILER
# pragma warning(pop)
#endif
if (ptr->mark != ARES_DATATYPE_MARK) if (ptr->mark != ARES_DATATYPE_MARK)
return; return;
@@ -134,8 +144,18 @@ ares_datatype ares_get_datatype(void * dataptr)
{ {
struct ares_data *ptr; struct ares_data *ptr;
#ifdef __INTEL_COMPILER
# pragma warning(push)
# pragma warning(disable:1684)
/* 1684: conversion from pointer to same-sized integral type */
#endif
ptr = (void *)((char *)dataptr - offsetof(struct ares_data, data)); ptr = (void *)((char *)dataptr - offsetof(struct ares_data, data));
#ifdef __INTEL_COMPILER
# pragma warning(pop)
#endif
if (ptr->mark == ARES_DATATYPE_MARK) if (ptr->mark == ARES_DATATYPE_MARK)
return ptr->type; return ptr->type;

29
lib/base64.c
View File

@@ -54,28 +54,27 @@ static const char table64[]=
static void decodeQuantum(unsigned char *dest, const char *src) static void decodeQuantum(unsigned char *dest, const char *src)
{ {
size_t x = 0; const char *s, *p;
int i; unsigned long i, v, x = 0;
char *found;
union {
ssize_t sig;
size_t uns;
} offset;
for(i = 0; i < 4; i++) { for(i = 0, s = src; i < 4; i++, s++) {
if((found = strchr(table64, src[i])) != NULL) { v = 0;
offset.sig = found - table64; p = table64;
x = (x << 6) + offset.uns; while(*p && (*p != *s)) {
v++;
p++;
} }
else if(src[i] == '=') if(*p == *s)
x = (x << 6) + v;
else if(*s == '=')
x = (x << 6); x = (x << 6);
} }
dest[2] = (unsigned char)(x & (size_t)0xFFUL); dest[2] = (unsigned char)(x & 0xFFUL);
x >>= 8; x >>= 8;
dest[1] = (unsigned char)(x & (size_t)0xFFUL); dest[1] = (unsigned char)(x & 0xFFUL);
x >>= 8; x >>= 8;
dest[0] = (unsigned char)(x & (size_t)0xFFUL); dest[0] = (unsigned char)(x & 0xFFUL);
} }
/* /*

20
lib/memdebug.c
View File

@@ -221,9 +221,19 @@ void *curl_dorealloc(void *ptr, size_t wantedsize,
if(countcheck("realloc", line, source)) if(countcheck("realloc", line, source))
return NULL; return NULL;
#ifdef __INTEL_COMPILER
# pragma warning(push)
# pragma warning(disable:1684)
/* 1684: conversion from pointer to same-sized integral type */
#endif
if(ptr) if(ptr)
mem = (void *)((char *)ptr - offsetof(struct memdebug, mem)); mem = (void *)((char *)ptr - offsetof(struct memdebug, mem));
#ifdef __INTEL_COMPILER
# pragma warning(pop)
#endif
mem = (Curl_crealloc)(mem, size); mem = (Curl_crealloc)(mem, size);
if(source) if(source)
curl_memlog("MEM %s:%d realloc(%p, %zu) = %p\n", curl_memlog("MEM %s:%d realloc(%p, %zu) = %p\n",
@@ -243,8 +253,18 @@ void curl_dofree(void *ptr, int line, const char *source)
assert(ptr != NULL); assert(ptr != NULL);
#ifdef __INTEL_COMPILER
# pragma warning(push)
# pragma warning(disable:1684)
/* 1684: conversion from pointer to same-sized integral type */
#endif
mem = (void *)((char *)ptr - offsetof(struct memdebug, mem)); mem = (void *)((char *)ptr - offsetof(struct memdebug, mem));
#ifdef __INTEL_COMPILER
# pragma warning(pop)
#endif
/* destroy */ /* destroy */
memset(mem->mem, 0x13, mem->size); memset(mem->mem, 0x13, mem->size);