Imported Upstream version 0.5.4

[pkg/abook.git] / abook.h

diff --git a/abook.h b/abook.h
index 8fa08cd5f20d1059d9f2db1d8dc699c8b54d2b5b..0cdc513405db7b4bfba13cf4833854779b075cc6 100644 (file)
--- a/abook.h
+++ b/abook.h
@@ -3,10 +3,8 @@
 
 #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();
+void           quit_abook(int save_db);
 void           launch_wwwbrowser(int item);
 void           launch_mutt(int item);
 void           print_stderr(int item);
@@ -19,11 +17,17 @@ int         strncasecmp (const char *, const char *, size_t);
 
 #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 DATAFILE       ".abook.addressbook"
+#define DIR_IN_HOME    ".abook"
+#define DATAFILE       "addressbook"
+
+#define RCFILE         "abookrc"
+
+#define QUIT_SAVE      1
+#define QUIT_DONTSAVE  0
 
 /*
  * some "abookwide" useful macros
@@ -32,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))