--- parser3/src/main/pa_common.C 2004/03/23 15:11:15 1.182 +++ parser3/src/main/pa_common.C 2004/04/06 14:18:00 1.186 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_COMMON_C="$Date: 2004/03/23 15:11:15 $"; +static const char * const IDENT_COMMON_C="$Date: 2004/04/06 14:18:00 $"; #include "pa_common.h" #include "pa_exception.h" @@ -142,13 +142,15 @@ static bool set_addr(struct sockaddr_in addr->sin_port=htons(port); if(host) { ulong packed_ip=inet_addr(host); - struct hostent *hostIP = packed_ip==INADDR_NONE? - gethostbyname(host) - : gethostbyaddr((char *)&packed_ip, sizeof(packed_ip), AF_INET); - if(hostIP) - memcpy(&addr->sin_addr, hostIP->h_addr, hostIP->h_length); - else - return false; + if(packed_ip!=INADDR_NONE) + memcpy(&addr->sin_addr, &packed_ip, sizeof(packed_ip)); + else { + struct hostent *hostIP=gethostbyname(host); + if(hostIP) + memcpy(&addr->sin_addr, hostIP->h_addr, hostIP->h_length); + else + return false; + } } else addr->sin_addr.s_addr=INADDR_ANY; return true; @@ -1264,7 +1266,7 @@ static char *base64_alphabet = static size_t g_mime_utils_base64_encode_step (const unsigned char *in, size_t inlen, unsigned char *out, int *state, int *save) { - const register unsigned char *inptr; + register const unsigned char *inptr; register unsigned char *outptr; if (inlen <= 0) @@ -1387,7 +1389,10 @@ char* pa_base64(const char *in, size_t l char* result=new(PointerFreeGC) char[len * 2 + 6]; int state=0; int save=0; - size_t filled=g_mime_utils_base64_encode_close ((const unsigned char*)in, len, +#ifndef NDEBUG + size_t filled= +#endif + g_mime_utils_base64_encode_close ((const unsigned char*)in, len, (unsigned char*)result, &state, &save); assert(filled <= len * 2 + 6);