--- parser3/src/classes/file.C 2007/05/03 10:40:45 1.157 +++ parser3/src/classes/file.C 2007/08/20 10:37:21 1.160 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_FILE_C="$Date: 2007/05/03 10:40:45 $"; +static const char * const IDENT_FILE_C="$Date: 2007/08/20 10:37:21 $"; #include "pa_config_includes.h" @@ -36,9 +36,6 @@ static const char * const IDENT_FILE_C=" #define NAME_NAME "name" -#define FILE_NAME_MUST_BE_STRING "file name must be string" -#define FILE_NAME_MUST_NOT_BE_CODE "file name must not be code" - // externs extern String sql_limit_name; @@ -639,7 +636,11 @@ static void _lock(Request& r, MethodPara ¶ms.as_junction(1, "body must be code") }; - file_write_action_under_lock(file_spec, "lock", lock_execute_body, &info); + file_write_action_under_lock( + file_spec, + "lock", + lock_execute_body, + &info); } static int lastposafter(const String& s, size_t after, const char* substr, size_t substr_size, bool beforelast=false) { @@ -864,7 +865,7 @@ static void _base64(Request& r, MethodPa VFile& self=GET_SELF(r, VFile); if(params.count()) { // decode - const char* cstr=params.as_string(0, "parameter must be string").cstr(); + const char* cstr=params.as_string(0, PARAMETER_MUST_BE_STRING).cstr(); char* decoded_cstr=0; size_t decoded_size=0; pa_base64_decode(cstr, strlen(cstr), decoded_cstr, decoded_size);