--- parser3/src/classes/hashfile.C 2020/11/10 22:42:24 1.63 +++ parser3/src/classes/hashfile.C 2025/05/26 01:56:54 1.68 @@ -1,8 +1,8 @@ /** @file Parser: @b hashfile parser class. - Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ #include "classes.h" @@ -12,7 +12,7 @@ #include "pa_vhashfile.h" #include "pa_vhash.h" -volatile const char * IDENT_HASHFILE_C="$Id: hashfile.C,v 1.63 2020/11/10 22:42:24 moko Exp $"; +volatile const char * IDENT_HASHFILE_C="$Id: hashfile.C,v 1.68 2025/05/26 01:56:54 moko Exp $"; // class @@ -42,7 +42,7 @@ static void _open(Request& r, MethodPara r.classes_conf.put(OPEN_DATA_NAME, file_list); } - const String& file_spec=r.full_disk_path(params.as_string(0, FILE_NAME_MUST_BE_STRING)); + const String& file_spec=r.full_disk_path(params.as_file_name(0)); if(file_list->get(file_spec)) throw Exception(PARSER_RUNTIME, 0, @@ -98,7 +98,7 @@ static bool one_foreach_cycle( void* ainfo) { Foreach_info& info=*static_cast(ainfo); if(info.key_var_name){ - VString* vkey=new VString(*new String(key, String::L_TAINTED)); + VString* vkey=new VString(key); info.r->put_element(*info.var_context, *info.key_var_name, vkey); } if(info.value_var_name){