--- parser3/src/main/pa_common.C 2005/11/24 12:28:48 1.214 +++ parser3/src/main/pa_common.C 2006/02/03 15:08:04 1.217 @@ -26,7 +26,7 @@ * */ -static const char * const IDENT_COMMON_C="$Date: 2005/11/24 12:28:48 $"; +static const char * const IDENT_COMMON_C="$Date: 2006/02/03 15:08:04 $"; #include "pa_common.h" #include "pa_exception.h" @@ -430,17 +430,17 @@ static bool entry_readable(const String& } return false; } -bool file_readable(const String& file_spec) { +bool file_exist(const String& file_spec) { return entry_readable(file_spec, false); } -bool dir_readable(const String& file_spec) { +bool dir_exists(const String& file_spec) { return entry_readable(file_spec, true); } -const String* file_readable(const String& path, const String& name) { +const String* file_exist(const String& path, const String& name) { String& result=*new String(path); result << "/"; result << name; - return file_readable(result)?&result:0; + return file_exist(result)?&result:0; } bool file_executable(const String& file_spec) { return access(file_spec.cstr(String::L_FILE_SPEC), X_OK)==0; @@ -553,7 +553,7 @@ char* unescape_chars(const char* cp, int EscapeFirst, EscapeSecond } escapeState=EscapeRest; - uchar escapedValue=0; + uint escapedValue=0; int srcPos=0; int dstPos=0; while(srcPos < len) { @@ -569,12 +569,12 @@ char* unescape_chars(const char* cp, int } break; case EscapeFirst: - escapedValue=(uchar)(hex_value[ch] << 4); + escapedValue=hex_value[ch] << 4; escapeState=EscapeSecond; break; case EscapeSecond: escapedValue +=hex_value[ch]; - s[dstPos++]=escapedValue; + s[dstPos++]=(char)escapedValue; escapeState=EscapeRest; break; } @@ -809,7 +809,7 @@ g_mime_utils_base64_encode_step (const u case 2: *saveout++ = *inptr++; case 1: *saveout++ = *inptr++; } - ((char *)save)[0] += inlen; + *(char *)save = *(char *)save+(char)inlen; } /*d(printf ("mode = %d\nc1 = %c\nc2 = %c\n", @@ -922,9 +922,9 @@ g_mime_utils_base64_decode_step (const u saved = (saved << 6) | c; i++; if (i == 4) { - *outptr++ = saved >> 16; - *outptr++ = saved >> 8; - *outptr++ = saved; + *outptr++ = (unsigned char)(saved >> 16); + *outptr++ = (unsigned char)(saved >> 8); + *outptr++ = (unsigned char)(saved); i = 0; } }