--- parser3/src/include/pa_common.h	2003/03/26 13:46:58	1.89.2.13.2.8
+++ parser3/src/include/pa_common.h	2003/04/11 16:05:43	1.89.2.13.2.13
@@ -8,8 +8,7 @@
 #ifndef PA_COMMON_H
 #define PA_COMMON_H
 
-static const char* IDENT_COMMON_H="$Date: 2003/03/26 13:46:58 $";
-
+static const char* IDENT_COMMON_H="$Date: 2003/04/11 16:05:43 $";
 
 #include "pa_string.h"
 #include "pa_hash.h"
@@ -64,8 +63,8 @@ int pa_sleep(unsigned long secs, unsigne
 	can't say that about other systems/ line break styles
 */
 void fix_line_breaks(
-		     char *buf,
-		     size_t& size ///< may change! used to speedup next actions
+		     char *str,
+		     size_t& length///< may change! used to speedup next actions
 		     );
 
 typedef void (*File_read_action)(
@@ -93,7 +92,7 @@ bool file_read_action_under_lock(const S
 
   	@returns true if read OK
 */
-char *file_read_text(Charset& charset, 
+char *file_read_text(Request_charsets& charsets, 
 					 const String& file_spec, 
 					 bool fail_on_read_problem=true,
 					 HashStringValue* options=0/*, HashStringValue* * out_fields=0*/);
@@ -112,7 +111,7 @@ struct File_read_result {
 
 	@returns true if read OK
 */
-File_read_result file_read(Charset& charset, 
+File_read_result file_read(Request_charsets& charsets, 
 			   const String& file_spec, 
 			   bool as_text,
 			   HashStringValue* options=0,
@@ -183,13 +182,6 @@ char *lsplit(char **string_ref,char deli
 char *rsplit(char *string, char delim);
 const char* format(double value, char *fmt);
 
-#ifndef max
-inline int max(int a, int b) { return a>b?a:b; }
-inline int min(int a, int b){ return a<b?a:b; }
-inline size_t max(size_t a, size_t b) { return a>b?a:b; }
-inline size_t min(size_t a, size_t b){ return a<b?a:b; }
-#endif
-
 size_t stdout_write(const void *buf, size_t size);
 
 char *unescape_chars(const char* cp, int len);
@@ -211,6 +203,10 @@ int getMonthDays(int year, int month);
 
 void remove_crlf(char *start, char *end);
 
+#ifdef PA_SAFE_MODE 
+void check_safe_mode(struct stat finfo, const String& file_spec, const char* fname); 
+#endif 
+
 // globals
 
 extern const String file_status_name;