--- parser3/src/include/pa_common.h 2001/11/09 11:06:57 1.62 +++ parser3/src/include/pa_common.h 2001/12/27 19:57:08 1.69 @@ -4,18 +4,25 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://paf.design.ru) - $Id: pa_common.h,v 1.62 2001/11/09 11:06:57 paf Exp $ + $Id: pa_common.h,v 1.69 2001/12/27 19:57:08 paf Exp $ */ #ifndef PA_COMMON_H #define PA_COMMON_H -#include "pa_config_includes.h" #include "pa_pool.h" #include "pa_string.h" class Value; +// replace system s*nprintf with our versions +#undef vsnprintf +int __vsnprintf(char *, size_t, const char *, va_list); +#define vsnprintf __vsnprintf +#undef snprintf +int __snprintf(char *, size_t, const char *, ...); +#define snprintf __snprintf + #if _MSC_VER /* inline int open( const char *filename, int oflag ) { return _open(filename, oflag); } @@ -26,15 +33,6 @@ inline int stat( const char *path, struc inline long lseek( int handle, long offset, int origin ) { return _lseek(handle, offset, origin); } */ -#ifndef vsnprintf -int __vsnprintf(char *, size_t, const char *, va_list); -# define vsnprintf __vsnprintf -#endif -#ifndef snprintf -int __snprintf(char *, size_t, const char *, ...); -# define snprintf __snprintf -#endif - //access #define F_OK 0 #define X_OK 1 @@ -115,14 +113,13 @@ void file_write(Pool& pool, const String& file_spec, const void *data, size_t size, bool as_text, - bool do_append=false/*, - bool exclusive=false*/); + bool do_append=false); /** delete specified file throws an exception in case of problems */ -void file_delete(Pool& pool, const String& file_spec); +bool file_delete(Pool& pool, const String& file_spec, bool fail_on_read_problem=true); /** move specified file throws an exception in case of problems