--- parser3/src/main/pa_globals.C 2002/11/22 16:16:33 1.140 +++ parser3/src/main/pa_globals.C 2002/11/26 15:09:12 1.143 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_GLOBALS_C="$Date: 2002/11/22 16:16:33 $"; +static const char* IDENT_GLOBALS_C="$Date: 2002/11/26 15:09:12 $"; #include "pa_config_includes.h" @@ -76,6 +76,11 @@ String *charset_UTF8_name; String *hash_default_element_name; +String *http_method_name; +String *http_timeout_name; +String *http_headers_name; +String *file_status_name; + Table *string_match_table_template; @@ -361,10 +366,17 @@ void pa_globals_init(Pool& pool) { // hash hash_default_element_name=NEW String(pool, HASH_DEFAULT_ELEMENT_NAME); + // http + http_method_name=NEW String(pool, HTTP_METHOD_NAME); + http_timeout_name=NEW String(pool, HTTP_TIMEOUT_NAME); + http_headers_name=NEW String(pool, HTTP_HEADERS_NAME); + file_status_name=NEW String(pool, FILE_STATUS_NAME); + + // hashes untaint_lang_name2enum=NEW Hash(pool); #define ULN(cstr, LANG) \ - untaint_lang_name2enum->put(*NEW String(pool, cstr), (int)String::UL_##LANG); + untaint_lang_name2enum->put(*NEW String(pool, (void *)cstr), (int)String::UL_##LANG); ULN("as-is", AS_IS); ULN("file-spec", FILE_SPEC); ULN("http-header", HTTP_HEADER); @@ -383,7 +395,7 @@ void pa_globals_init(Pool& pool) { { \ char *buf=(char *)malloc(MAX_NUMBER); \ snprintf(buf, MAX_NUMBER, "%u", tag); \ - exif_tag_value2name->put(*NEW String(pool, buf), #name); \ + exif_tag_value2name->put(*NEW String(pool, buf), (void *)#name); \ } // Tags used by IFD0 (main image) EXIF_TAG(0x010e, ImageDescription);