From: Jaakko Heinonen <jheinonen@users.sourceforge.net>
Date: Sun, 18 Nov 2001 22:27:21 +0000 (+0000)
Subject: Fixes to make Solaris cc happy
X-Git-Tag: upstream/0.6.1~2^2~320
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=08647c0fa571eb3a07490ab0971dc89677775537;p=pkg%2Fabook.git

Fixes to make Solaris cc happy
---

diff --git a/ChangeLog b/ChangeLog
index e4bc170..8308e9e 100644
--- 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 be5be2a..e389d5a 100644
--- 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 8a4ce31..194ba52 100644
--- 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 );