--- parser3/src/classes/math.C 2002/08/01 11:26:44 1.22 +++ parser3/src/classes/math.C 2003/01/31 12:34:27 1.24.2.2 @@ -1,11 +1,11 @@ /** @file Parser: @b math parser class. - Copyright(c) 2001, 2002 ArtLebedev Group(http://www.artlebedev.com) + Copyright(c) 2001-2003 ArtLebedev Group(http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_MATH_C="$Id: math.C,v 1.22 2002/08/01 11:26:44 paf Exp $"; +static const char* IDENT_MATH_C="$Date: 2003/01/31 12:34:27 $"; #include "pa_common.h" #include "pa_vint.h" @@ -24,7 +24,6 @@ static const char* IDENT_MATH_C="$Id: ma // defines -#define PI 3.1415926535 #define MAX_SALT 8 // class @@ -114,10 +113,10 @@ MATH2(pow); inline bool is_salt_body_char(int c) { return isalnum(c) || c == '.' || c=='/'; } -static size_t calc_prefix_size(const char *salt) { +static size_t calc_prefix_size(const char* salt) { if(size_t salt_size=strlen(salt)) { if(!is_salt_body_char(salt[0])) { // $... {... - const char *cur=salt+1; // skip + const char* cur=salt+1; // skip while(is_salt_body_char(*cur++)) // ...$ ...} ; return cur-salt; @@ -128,11 +127,11 @@ static size_t calc_prefix_size(const cha } static void _crypt(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - const char *password=params->as_string(0, "password must be string").cstr(); - const char *maybe_bodyless_salt=params->as_string(1, "salt must be string").cstr(); + const char* password=params->as_string(0, "password must be string").cstr(); + const char* maybe_bodyless_salt=params->as_string(1, "salt must be string").cstr(); size_t prefix_size=calc_prefix_size(maybe_bodyless_salt); - const char *normal_salt; + const char* normal_salt; char normalize_buf[MAX_STRING]; if(prefix_size==strlen(maybe_bodyless_salt)) { // bodyless? strncpy(normalize_buf, maybe_bodyless_salt, MAX_STRING-MAX_SALT-1); @@ -157,7 +156,7 @@ static void _crypt(Request& r, const Str r.write_pass_lang(*new(pool) String(pool, sample_buf)); } else { #ifdef HAVE_CRYPT - const char *sample_buf=crypt(password, normal_salt); + const char* sample_buf=crypt(password, normal_salt); if(!sample_buf // nothing generated || !sample_buf[0] // generated nothing || strncmp(sample_buf, normal_salt, prefix_size)!=0) // salt prefix not preserved @@ -222,16 +221,10 @@ void MMath::configure_admin(Request&) { // global variables -Methoded *math_base_class; -Hash *math_consts; +VStateless_classPtr math_base_class(???); // creator Methoded *MMath_create(Pool& pool) { - math_consts=new(pool) Hash(pool); - math_consts->put( - *new(pool) String(pool, "PI"), - new(pool) VDouble(pool, PI)); - return math_base_class=new(pool) MMath(pool); }