Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash

[paraslash.git] / string.h

diff --git a/string.h b/string.h
index e5033db2b91bd3ca4f0e4a6b27474f924f74343f..5a76c0495ea4b25d949bdd393caf060377622a71 100644 (file)
--- a/string.h
+++ b/string.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -18,16 +18,6 @@
 
 /** \file string.h exported sybmols from string.c */
 
-/** contains name/replacement pairs used by s_a_r_list()
- *
- * \sa s_a_r()
- */
-struct para_macro {
-       /** the name of the macro */
-       const char *name;
-       /** the replacement text */
-       const char *replacement;
-};
 __must_check __malloc void *para_realloc(void *p, size_t size);
 __must_check __malloc void *para_malloc(size_t size);
 __must_check __malloc void *para_calloc(size_t size);
@@ -36,8 +26,6 @@ __must_check __malloc __printf_1_2 char *make_message(const char *fmt, ...);
 __must_check __malloc char *para_strcat(char *a, const char *b);
 __must_check __malloc char *para_dirname(const char *name);
 __must_check __malloc char *para_basename(const char *name);
-__must_check __malloc char *s_a_r(const char *src, const char* regex, const char *replacement);
-__must_check __malloc char *s_a_r_list(struct para_macro *pm, char *src);
 void chop(char* buf);
 __must_check __malloc char *para_tmpname(void);
 __must_check int para_mkstemp(char *template, mode_t mode);