Fixes to make Solaris cc happy

diff --git a/ChangeLog b/ChangeLog
index e4bc1704e10ae5a99113555051230cd7bb87ff8a..8308e9e50b7b6115e48fa4f74ccafd8891fbc49e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+0.4.16
+ - bugfixes
+
 0.4.15
  - new options --add-email and --add-email-quiet
  - proper mutt alias import filter

diff --git a/abook.c b/abook.c
index be5be2a77159382197f880834cdde223be083652..e389d5a9b03bb791661c9ba19d035ca92a9873ac 100644 (file)
--- a/abook.c
+++ b/abook.c
@@ -506,6 +506,12 @@ quit_add_email()
        exit(0);
 }
 
+static void
+quit_add_email_sig(int signal)
+{
+       quit_add_email();
+}
+
 static void
 init_add_email()
 {
@@ -521,7 +527,7 @@ init_add_email()
 
        atexit(close_database);
 
-       signal(SIGINT, quit_add_email);
+       signal(SIGINT, quit_add_email_sig);
 }
 
 static int

diff --git a/estr.c b/estr.c
index 8a4ce31f6246610925ad0058c0b7b5fc4d6f6a4c..194ba52b798dfb19c1702ad3c22b142f038ffdd8 100644 (file)
--- a/estr.c
+++ b/estr.c
@@ -316,7 +316,7 @@ filesel_sort_list()
                qsort((void *)lst, fdp, sizeof(struct filesel_list_item),
                                filenamecmp );
 
-       qsort((void *)lst + fdp * sizeof(struct filesel_list_item),
+       qsort((void *)(lst + fdp * sizeof(struct filesel_list_item)),
                        FILESEL_LAST_ITEM - fdp + 1,
                        sizeof(struct filesel_list_item),
                        filenamecmp );