X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=miscutil.h;h=1089dc97a51b396d80ffb79bf74941293e170d48;hp=2638be9337ae8ee746261724e49431f13201a59f;hb=3fee6d0fa7176cc379b6554285edeb200fe7b34e;hpb=a5823f709d110f48f4bf6d973fda0e0455d1506b diff --git a/miscutil.h b/miscutil.h index 2638be93..1089dc97 100644 --- a/miscutil.h +++ b/miscutil.h @@ -1,6 +1,6 @@ -#ifndef _MISCUTIL_H -#define _MISCUTIL_H -#define MISCUTIL_H_VERSION "$Id: miscutil.h,v 1.7 2001/06/05 22:32:01 jongfoster Exp $" +#ifndef MISCUTIL_H_INCLUDED +#define MISCUTIL_H_INCLUDED +#define MISCUTIL_H_VERSION "$Id: miscutil.h,v 1.12 2001/10/23 21:27:50 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.h,v $ @@ -37,6 +37,26 @@ * * Revisions : * $Log: miscutil.h,v $ + * 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() + * + * Revision 1.9 2001/07/29 18:43:08 jongfoster + * Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to + * ANSI C rules. + * + * Revision 1.8 2001/06/29 13:32:14 oes + * Removed logentry from cancelled commit + * * Revision 1.7 2001/06/05 22:32:01 jongfoster * New function make_path() to splice directory and file names together. * @@ -87,13 +107,15 @@ *********************************************************************/ +#include "project.h" + #if defined(__cplusplus) extern "C" { #endif extern void *zalloc(int size); -extern unsigned long hash_string(const char* s); +extern unsigned int hash_string(const char* s); extern char *safe_strerror(int err); @@ -101,6 +123,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 jb_err string_append(char **target_string, const char *text_to_append); extern char *chomp(char *string); extern int simplematch(char *pattern, char *text); @@ -113,6 +136,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[]; @@ -121,10 +148,10 @@ extern const char miscutil_h_rcs[]; } #endif -#endif /* ndef _MISCUTIL_H */ +#endif /* ndef MISCUTIL_H_INCLUDED */ /* Local Variables: tab-width: 3 end: -*/ +*/ \ No newline at end of file