X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib%2Fstr.h;h=b5bf82f8372826b9fa5834cd87122bddd5c24a3f;hp=3dc825edd103006b8831a190035e6c9ab1de9aa9;hb=a8aba140a61d5b86093cea46afcb613092d4978d;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b

diff --git a/lib/str.h b/lib/str.h
index 3dc825e..b5bf82f 100644
--- a/lib/str.h
+++ b/lib/str.h
@@ -7,59 +7,19 @@
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
  */
-
 #ifndef _LIB_STR_H
 #define _LIB_STR_H
 
 #include <sys/types.h>
 
-#define NONULL(x) x?x:""
-
-# define HUGE_STRING     5120
-# define LONG_STRING     1024
-# define STRING          256
-# define SHORT_STRING    128
-
-/*
- * Create a format string to be used with scanf.
- * To use it, write, for instance, MUTT_FORMAT(HUGE_STRING).
- * 
- * See K&R 2nd ed, p. 231 for an explanation.
- */
-# define _MUTT_FORMAT_2(a,b)	"%" a  b
-# define _MUTT_FORMAT_1(a, b)	_MUTT_FORMAT_2(#a, b)
-# define MUTT_FORMAT(a)		_MUTT_FORMAT_1(a, "s")
-# define MUTT_FORMAT2(a,b)	_MUTT_FORMAT_1(a, b)
-
-# define ISSPACE(c) isspace((unsigned char)c)
-# define ISBLANK(c) (c == ' ' || c == '\t')
-# define strfcpy(A,B,C) strncpy(A,B,C), *(A+(C)-1)=0
-/* this macro must check for *c == 0 since isspace(0) has
- * unreliable behavior on some systems */
-# define SKIPWS(c) while (*(c) && isspace ((unsigned char) *(c))) c++;
-
-/*
- * safety wrappers/replacements
- * (mostly only difference: safely handle NULL strings)
- */
-char *safe_strdup (const char*);
-char *safe_strcat (char*, size_t, const char*);
-char *safe_strncat (char*, size_t, const char*, size_t);
-int safe_strcmp (const char*, const char*);
-int safe_strcasecmp (const char*, const char*);
-int safe_strncmp (const char*, const char*, size_t);
-int safe_strncasecmp (const char*, const char*, size_t);
-int safe_strcoll (const char*, const char*);
-size_t safe_strlen (const char*);
-
 /*
  * tools
  */
 char *str_tolower (char*);
 char *str_substrcpy (char*, const char*, const char*, size_t);
 char *str_substrdup (const char*, const char*);
-void str_replace (char**, const char*);
-void str_adjust (char**);
+int str_eq (const char*, const char*);
 const char *str_isstr (const char*, const char*);
+void str_skip_trailws (char*);
 
 #endif /* !_LIB_STR_H */