# HG changeset patch
# User markus schnalke <meillo@marmaro.de>
# Date 1326563088 -3600
# Node ID 9bc3e47b0222ca5594e734f55de8a6a7451eab4e
# Parent  028bc124d74455c8a7edbe9f96246dca0f38844b
Various cleanups to remove compiler warnings.
We're clean now, if we specify `-Wno-pointer-sign'.

diff -r 028bc124d744 -r 9bc3e47b0222 src/accept.c
--- a/src/accept.c	Sat Jan 14 18:20:03 2012 +0100
+++ b/src/accept.c	Sat Jan 14 18:44:48 2012 +0100
@@ -42,19 +42,6 @@
 	return res;
 }
 
-static gint
-_g_list_addr_isequal(gconstpointer a, gconstpointer b)
-{
-	address *addr1 = (address *) a;
-	address *addr2 = (address *) b;
-	int ret;
-
-	if ((ret = strcasecmp(addr1->domain, addr2->domain)) == 0) {
-		return strcmp(addr1->local_part, addr2->local_part);
-	}
-	return ret;
-}
-
 /*
 **  accept message from anywhere.
 **  A message from local is indicated by msg->recieved_host == NULL
diff -r 028bc124d744 -r 9bc3e47b0222 src/log.c
--- a/src/log.c	Sat Jan 14 18:20:03 2012 +0100
+++ b/src/log.c	Sat Jan 14 18:44:48 2012 +0100
@@ -17,6 +17,7 @@
 **  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include <sys/stat.h>
 #include <sysexits.h>
 
 #include "masqmail.h"
diff -r 028bc124d744 -r 9bc3e47b0222 src/peopen.c
--- a/src/peopen.c	Sat Jan 14 18:20:03 2012 +0100
+++ b/src/peopen.c	Sat Jan 14 18:44:48 2012 +0100
@@ -15,18 +15,20 @@
 #include "peopen.h"
 #include "masqmail.h"
 
-static void
-destroy_argv(char **arr)
-{
-	char *p = arr[0];
-	int i = 0;
-
-	while (p) {
-		free(p);
-		p = arr[i++];
-	}
-	free(arr);
-}
+/*
+** static void
+** destroy_argv(char **arr)
+** {
+** 	char *p = arr[0];
+** 	int i = 0;
+** 
+** 	while (p) {
+** 		free(p);
+** 		p = arr[i++];
+** 	}
+** 	free(arr);
+** }
+*/
 
 static char**
 create_argv(const char *cmd, int count)
diff -r 028bc124d744 -r 9bc3e47b0222 src/readsock.c
--- a/src/readsock.c	Sat Jan 14 18:20:03 2012 +0100
+++ b/src/readsock.c	Sat Jan 14 18:44:48 2012 +0100
@@ -25,7 +25,6 @@
 #include <ctype.h>
 
 #include "readsock.h"
-/*#include "masqmail.h"*/
 
 jmp_buf jmp_timeout;
 
@@ -150,8 +149,13 @@
 		_read_chug(in);
 	}
 
-	if (!*pbuf)
-		*pbuf = (char *) g_malloc(size);
+	if (!*pbuf) {
+		*pbuf = (char *) malloc(size);
+		if (!*pbuf) {
+			fprintf(stderr, "Out of memory.\n");
+			exit(1);
+		}
+	}
 	buf = *pbuf;
 
 	while (1) {
diff -r 028bc124d744 -r 9bc3e47b0222 src/smtp_out.h
--- a/src/smtp_out.h	Sat Jan 14 18:20:03 2012 +0100
+++ b/src/smtp_out.h	Sat Jan 14 18:44:48 2012 +0100
@@ -81,5 +81,6 @@
 gboolean smtp_out_init(smtp_base *psb, gboolean instant_helo);
 gint smtp_out_msg(smtp_base *psb, message *msg, address *return_path, GList *rcpt_list, GList *hdr_list);
 gboolean smtp_out_quit(smtp_base *psb);
+void smtp_out_mark_rcpts(smtp_base *psb, GList *rcpt_list);
 
 gint smtp_deliver(gchar *host, gint port, GList *resolve_list, message *msg, address *return_path, GList *rcpt_list);