summaryrefslogtreecommitdiff
path: root/mail/clamav/patches/patch-ah
blob: 25aa5e7bb5c4886bef4ebb9efea7721a6c410f3a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
$NetBSD: patch-ah,v 1.5 2005/10/13 18:09:06 rillig Exp $

--- clamav-milter/clamav-milter.c.orig	Fri Sep 16 00:24:41 2005
+++ clamav-milter/clamav-milter.c	Thu Oct 13 20:07:24 2005
@@ -2973,7 +2973,7 @@ clamfi_eom(SMFICTX *ctx)
 						 * the postmaster, so include
 						 * some useful information
 						 */
-						fprintf(sendmail, _("The message %1$s sent from %2$s to\n"),
+						fprintf(sendmail, _("The message %s sent from %s to\n"),
 							sendmailId, privdata->from);
 					else
 						fprintf(sendmail, _("A message sent from %s to\n"),
@@ -2987,7 +2987,7 @@ clamfi_eom(SMFICTX *ctx)
 						fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename);
 
 					if(hflag) {
-						fprintf(sendmail, _("\nThe message was received by %1$s from %2$s via %3$s\n\n"),
+						fprintf(sendmail, _("\nThe message was received by %s from %s via %s\n\n"),
 							smfi_getsymval(ctx, "j"), privdata->from,
 							smfi_getsymval(ctx, "_"));
 						fputs(_("For your information, the original message headers were:\n\n"), sendmail);
@@ -3439,9 +3439,9 @@ clamd_recv(int sock, char *buf, size_t l
 {
 	fd_set rfds;
 	struct timeval tv;
+	int ret;
 
 	assert(sock >= 0);
-	int ret;
 
 	if(readTimeout == 0) {
 		do
@@ -4150,7 +4150,7 @@ qfile(struct privdata *privdata, const c
 
 	if(move(privdata->filename, newname) < 0) {
 		if(use_syslog)
-			syslog(LOG_WARNING, _("Can't rename %1$s to %2$s"),
+			syslog(LOG_WARNING, _("Can't rename %s to %s"),
 				privdata->filename, newname);
 		free(newname);
 		return -1;