X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=abook.h;h=0631b8f0f858ff6fbbce6420e454d7687069f04e;hb=b1c882049db5d6d7d5770134cd93e14934ace6c1;hp=f6c756b70428737b6caa17a2fe1dd1e462a037d6;hpb=853a82571bfc466bc9257046ef172512220e00b5;p=pkg%2Fabook.git

diff --git a/abook.h b/abook.h
index f6c756b..0631b8f 100644
--- a/abook.h
+++ b/abook.h
@@ -3,8 +3,6 @@
 
 #include <stdio.h>
 
-void		*abook_malloc(size_t size);
-void		*abook_realloc(void *ptr, size_t size);
 FILE		*abook_fopen (const char *path, const char *mode);
 void		quit_abook(int save_db);
 void		launch_wwwbrowser(int item);
@@ -15,12 +13,12 @@ int		strcasecmp (const char *, const char *);
 int		strncasecmp (const char *, const char *, size_t);
 #endif
 
-#define MAIN_HELPLINE        "q:quit  ?:help  a:add  r:remove"
+#define MAIN_HELPLINE        N_("q:quit  ?:help  a:add  r:remove")
 
 #define Y_STATUSLINE   	(LINES - 2)
 
-#define MIN_LINES	20	
-#define MIN_COLS	70	
+#define MIN_LINES	20
+#define MIN_COLS	70
 
 #define DEFAULT_UMASK	066
 #define DIR_IN_HOME	".abook"
@@ -38,10 +36,8 @@ int		strncasecmp (const char *, const char *, size_t);
 #define hide_cursor()	curs_set(0)
 #define show_cursor()	curs_set(1)
 
-#define safe_atoi(X)    (X == NULL) ? 0 : atoi(X)
-#define my_free(X)	do {free(X); X=NULL;} while(0)
-#define safe_str(X)	X == NULL ? "" : X
-#define safe_strdup(X)	(X == NULL) ? NULL : strdup(X)
+#define safe_atoi(X)    ((X == NULL) ? 0 : atoi(X))
+#define safe_str(X)	((X == NULL) ? "" : X)
 
 #ifndef min
 #       define min(x,y) (((x)<(y)) ? (x):(y))
@@ -53,6 +49,9 @@ int		strncasecmp (const char *, const char *, size_t);
 
 #define ISSPACE(c)	isspace((unsigned char)c)
 
+#define SKIPWS(c)	while(*(c) && ISSPACE(*(c))) c++
+#define SKIPNONWS(c)	while(*(c) && ! ISSPACE(*(c))) c++
+
 #ifndef DEBUG
 #	define NDEBUG	1
 #else