cleanup namespace and put <sys/types.h> where it belongs so the stuff should compile...

[claws.git] / src / string_match.h

diff --git a/src/string_match.h b/src/string_match.h
index a338894b55c63c53e3f5f1d0298b620efff5716d..0bd5f78be338ad929aac1f895f13e9268b0b9255 100644 (file)
--- a/src/string_match.h
+++ b/src/string_match.h
@@ -17,38 +17,22 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-
-#ifndef __STRING_MATCH_H__
-#define __STRING_MATCH_H__
-
-#include <stdio.h>
-#include <regex.h>
-
-
-/* the size used for regexec in string_remove_match */
-/* this is probably not the most clever way to define this here, though */
-#define STRING_MATCH_MR_SIZE 30
-
-
-/* match a REXP in TXT, return non-zero if found */
-/* for documentation of SIZE, MATCHES, CFLAGS, and EFLAGS see "man regex" */
-/* MATCHES will be updated by regexec */
-int string_match_regexp(char * txt, char * rexp, \
-                       int size, regmatch_t matches[], \
-                       int cflags, int eflags);
+#ifndef STRING_MATCH_H__
+#define STRING_MATCH_H__
 
 /* remove substring matching REXP from TXT. Destructive! */
 /* for documentation of CFLAGS and EFLAGS see "man regex" */
 /* returns -1 = not found; N = next find pos */
 /* if the match is an empty string (e.g. "x\?"), the find position will
    be increased by 1 */
-int string_remove_match(char * txt, char * rexp, int cflags, int eflags);
+int string_remove_match        (char *txt, char *rexp, int cflags, int eflags);
 
 /* remove all substrings matching REXP from TXT. Destructive! */
 /* for documentation of CFLAGS and EFLAGS see "man regex" */
 /* returns position of last replacement (i.e. TXT has been modified up
    to this position, use this as the starting point for further mangling) */
-int string_remove_all_matches(char * txt, char * rexp, int cflags, int eflags);
+int string_remove_all_matches  (char *txt, char *rexp, int cflags, int eflags);
+
 
+#endif /* STRING_MATCH_H__ */
 
-#endif