--- parser3/src/classes/math.C 2003/07/24 11:31:20 1.34 +++ parser3/src/classes/math.C 2005/08/09 08:14:48 1.40 @@ -1,14 +1,14 @@ /** @file Parser: @b math parser class. - Copyright(c) 2001-2003 ArtLebedev Group(http://www.artlebedev.com) + Copyright(c) 2001-2005 ArtLebedev Group(http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) portions from gen_uuid.c, Copyright (C) 1996, 1997, 1998, 1999 Theodore Ts'o. */ -static const char* IDENT_MATH_C="$Date: 2003/07/24 11:31:20 $"; +static const char * const IDENT_MATH_C="$Date: 2005/08/09 08:14:48 $"; #include "pa_vmethod_frame.h" #include "pa_common.h" @@ -227,10 +227,10 @@ inline bool is_salt_body_char(int c) { return isalnum(c) || c == '.' || c=='/'; } static size_t calc_prefix_size(const char* salt) { - if(size_t salt_size=strlen(salt)) { - if(!is_salt_body_char(salt[0])) { // $... {... + if(strlen(salt)) { + if(!is_salt_body_char((unsigned char)salt[0])) { // $... {... const char* cur=salt+1; // skip - while(is_salt_body_char(*cur++)) // ...$ ...} + while(is_salt_body_char((unsigned char)*cur++)) // ...$ ...} ; return cur-salt; } else @@ -294,7 +294,6 @@ static const char* hex_string(unsigned c static const char *hex=upcase?"0123456789ABCDEF":"0123456789abcdef"; - const char *format=upcase?"%02X":"%02x"; for(; src