X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=miscutil.h;h=cd65fde9e09d1218b8e0ffb3b78c49ad3c11fc25;hp=61675a110d29304ddf10b8b5d6f1ad59f555a40d;hb=8e8592f169a794eb9f41d19853ee0ddd4e068a1c;hpb=558a90cea69e04e9001414b524d026198fe16228 diff --git a/miscutil.h b/miscutil.h index 61675a11..cd65fde9 100644 --- a/miscutil.h +++ b/miscutil.h @@ -1,6 +1,6 @@ #ifndef MISCUTIL_H_INCLUDED #define MISCUTIL_H_INCLUDED -#define MISCUTIL_H_VERSION "$Id: miscutil.h,v 1.10 2001/09/20 13:34:09 steudten Exp $" +#define MISCUTIL_H_VERSION "$Id: miscutil.h,v 1.13 2001/10/29 03:48:10 david__schmidt Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.h,v $ @@ -37,6 +37,19 @@ * * Revisions : * $Log: miscutil.h,v $ + * Revision 1.13 2001/10/29 03:48:10 david__schmidt + * OS/2 native needed a snprintf() routine. Added one to miscutil, brackedted + * by and __OS2__ ifdef. + * + * Revision 1.12 2001/10/23 21:27:50 jongfoster + * Standardising error codes in string_append + * make_path() no longer adds '\\' if the dir already ends in '\\' (this + * is just copying a UNIX-specific fix to the Windows-specific part) + * + * Revision 1.11 2001/10/14 22:02:57 jongfoster + * New function string_append() which is like strsav(), but running + * out of memory isn't automatically FATAL. + * * Revision 1.10 2001/09/20 13:34:09 steudten * * change long to int for prototype hash_string() @@ -98,10 +111,13 @@ *********************************************************************/ +#include "project.h" + #if defined(__cplusplus) extern "C" { #endif +extern const char *basedir; extern void *zalloc(int size); extern unsigned int hash_string(const char* s); @@ -112,7 +128,7 @@ extern int strcmpic(const char *s1, const char *s2); extern int strncmpic(const char *s1, const char *s2, size_t n); extern char *strsav(char *old, const char *text_to_append); -extern int string_append(char **target_string, const char *text_to_append); +extern jb_err string_append(char **target_string, const char *text_to_append); extern char *chomp(char *string); extern int simplematch(char *pattern, char *text); @@ -125,6 +141,10 @@ extern char *make_path(const char * dir, const char * file); extern char *strdup(const char *s); #endif /* def __MINGW32__ */ +#ifdef __OS2__ +extern int snprintf(char *, size_t, const char *, /*args*/ ...); +#endif /* def __OS2__ */ + /* Revision control strings from this header and associated .c file */ extern const char miscutil_rcs[]; extern const char miscutil_h_rcs[];