X-Git-Url: http://www.privoxy.org/gitweb/misc.html?a=blobdiff_plain;f=miscutil.h;h=1710fdc9f1b91cf300f8005498dcb1d516442ae5;hb=627fa51be5ff2810483adfdc7a6be13e3560bc70;hp=02a54d2273d934116a4580f812a4d31de53ad8b3;hpb=2935a01f7fffce53f81e235557f3ae5459e200e6;p=privoxy.git
diff --git a/miscutil.h b/miscutil.h
index 02a54d22..1710fdc9 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.3 2001/05/29 23:10:09 oes Exp $"
+#ifndef MISCUTIL_H_INCLUDED
+#define MISCUTIL_H_INCLUDED
+#define MISCUTIL_H_VERSION "$Id: miscutil.h,v 1.9 2001/07/29 18:43:08 jongfoster Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/miscutil.h,v $
@@ -37,6 +37,27 @@
*
* Revisions :
* $Log: miscutil.h,v $
+ * 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.
+ *
+ * Revision 1.6 2001/06/03 19:12:30 oes
+ * introduced bindup()
+ *
+ * Revision 1.5 2001/06/01 10:31:51 oes
+ * Added character class matching to trivimatch; renamed to simplematch
+ *
+ * Revision 1.4 2001/05/31 17:32:31 oes
+ *
+ * - Enhanced domain part globbing with infix and prefix asterisk
+ * matching and optional unanchored operation
+ *
* Revision 1.3 2001/05/29 23:10:09 oes
*
*
@@ -79,7 +100,7 @@ extern "C" {
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);
@@ -89,7 +110,11 @@ extern int strncmpic(const char *s1, const char *s2, size_t n);
extern char *strsav(char *old, const char *text_to_append);
extern char *chomp(char *string);
-extern int trivimatch(char *pattern, char *text);
+extern int simplematch(char *pattern, char *text);
+
+extern char *bindup(const char *string, int n);
+
+extern char *make_path(const char * dir, const char * file);
#ifdef __MINGW32__
extern char *strdup(const char *s);
@@ -103,7 +128,7 @@ extern const char miscutil_h_rcs[];
}
#endif
-#endif /* ndef _MISCUTIL_H */
+#endif /* ndef MISCUTIL_H_INCLUDED */
/*
Local Variables: