aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--driver.c6
-rw-r--r--fetchmail.c2
-rw-r--r--imap.c14
-rw-r--r--netrc.c2
-rw-r--r--pop3.c6
-rw-r--r--rcfile_y.y2
-rw-r--r--report.c2
7 files changed, 18 insertions, 16 deletions
diff --git a/driver.c b/driver.c
index 44ae9821..40408d13 100644
--- a/driver.c
+++ b/driver.c
@@ -731,7 +731,8 @@ static int readheaders(int sock,
if (!headers_ok)
{
if (outlevel > O_SILENT)
- report(stdout, 0,0,_("message delimiter found while scanning headers"));
+ report(stdout, 0,
+ _("message delimiter found while scanning headers"));
}
/*
@@ -869,7 +870,8 @@ static int readheaders(int sock,
if (ctl->errcount > olderrs) /* there were DNS errors above */
{
if (outlevel >= O_DEBUG)
- report(stdout, 0,0, _("forwarding and deletion suppressed due to DNS errors"));
+ report(stdout, 0,
+ _("forwarding and deletion suppressed due to DNS errors"));
free(msgblk.headers);
free_str_list(&msgblk.recipients);
return(PS_TRANSIENT);
diff --git a/fetchmail.c b/fetchmail.c
index 6264b9f1..f17ae6c0 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -464,7 +464,7 @@ int main (int argc, char **argv)
{
if (!nodetach)
daemonize(run.logfile, termhook);
- report(stdout, 0, 0, _("starting fetchmail %s daemon "), VERSION);
+ report(stdout, 0, _("starting fetchmail %s daemon "), VERSION);
/*
* We'll set up a handler for these when we're sleeping,
diff --git a/imap.c b/imap.c
index b085e35a..4a4ebe58 100644
--- a/imap.c
+++ b/imap.c
@@ -465,7 +465,7 @@ static int do_gssauth(int sock, char *hostname, char *username)
sec_token = GSS_C_NO_BUFFER;
context = GSS_C_NO_CONTEXT;
if (outlevel >= O_VERBOSE)
- report(stdout, 0,0,_("Sending credentials"));
+ report(stdout, 0, _("Sending credentials"));
do {
maj_stat = gss_init_sec_context(&min_stat, GSS_C_NO_CREDENTIAL,
&context, target_name, NULL, 0, 0, NULL, sec_token, NULL,
@@ -484,7 +484,7 @@ static int do_gssauth(int sock, char *hostname, char *username)
SockWrite(sock, buf1, strlen(buf1));
SockWrite(sock, "\r\n", 2);
if (outlevel >= O_MONITOR)
- report(stdout, 0,0,"IMAP> %s", buf1);
+ report(stdout, 0, "IMAP> %s", buf1);
if (maj_stat == GSS_S_CONTINUE_NEEDED) {
if (result = gen_recv(sock, buf1, sizeof buf1)) {
gss_release_name(&min_stat, &target_name);
@@ -512,7 +512,7 @@ static int do_gssauth(int sock, char *hostname, char *username)
return PS_AUTHFAIL;
}
if (outlevel >= O_DEBUG)
- report(stdout, 0,0,_("Credential exchange complete"));
+ report(stdout, 0, _("Credential exchange complete"));
/* first octet is security levels supported. We want none, for now */
server_conf_flags = ((char *)send_token.value)[0];
if ( !(((char *)send_token.value)[0] & GSSAUTH_P_NONE) ) {
@@ -525,11 +525,11 @@ static int do_gssauth(int sock, char *hostname, char *username)
/* we don't care about buffer size if we don't wrap data */
gss_release_buffer(&min_stat, &send_token);
if (outlevel >= O_DEBUG) {
- report(stdout, 0,0,_("Unwrapped security level flags: %s%s%s"),
+ report(stdout, 0, _("Unwrapped security level flags: %s%s%s"),
server_conf_flags & GSSAUTH_P_NONE ? "N" : "-",
server_conf_flags & GSSAUTH_P_INTEGRITY ? "I" : "-",
server_conf_flags & GSSAUTH_P_PRIVACY ? "C" : "-");
- report(stdout, 0,0,_("Maximum GSS token size is %ld"),buf_size);
+ report(stdout, 0, _("Maximum GSS token size is %ld"),buf_size);
}
/* now respond in kind (hack!!!) */
@@ -547,8 +547,8 @@ static int do_gssauth(int sock, char *hostname, char *username)
}
to64frombits(buf1, send_token.value, send_token.length);
if (outlevel >= O_DEBUG) {
- report(stdout, 0,0,_("Requesting authorisation as %s"), username);
- report(stdout, 0,0,"IMAP> %s",buf1);
+ report(stdout, 0, _("Requesting authorisation as %s"), username);
+ report(stdout, 0, "IMAP> %s",buf1);
}
SockWrite(sock, buf1, strlen(buf1));
SockWrite(sock, "\r\n", 2);
diff --git a/netrc.c b/netrc.c
index c3b3dad4..7228e337 100644
--- a/netrc.c
+++ b/netrc.c
@@ -209,7 +209,7 @@ parse_netrc (file)
if (premature_token)
{
#ifdef HAVE_ERROR
- error_at_line (0, 0, file, ln,
+ error_at_line (0, file, ln,
_("warning: found \"%s\" before any host names"),
premature_token);
#else
diff --git a/pop3.c b/pop3.c
index 4eb1aa07..0b3a5258 100644
--- a/pop3.c
+++ b/pop3.c
@@ -92,7 +92,7 @@ int pop3_ok (int sock, char *argbuf)
else
ok = PS_AUTHFAIL;
if (*bufp)
- report(stderr, 0,0,bufp);
+ report(stderr, 0, bufp);
}
else
ok = PS_PROTOCOL;
@@ -351,8 +351,8 @@ pop3_slowuidl( int sock, struct query *ctl, int *countp, int *newp)
try_id--;
}
} else {
- report(stderr, 0,0,_("Messages inserted into list on server. "
- "Cannot handle this."));
+ report(stderr, 0,
+ _("Messages inserted into list on server. Cannot handle this."));
return -1;
}
}
diff --git a/rcfile_y.y b/rcfile_y.y
index 7f36b3dd..54f1b534 100644
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -345,7 +345,7 @@ static struct query *hosttail; /* where to add new elements */
void yyerror (const char *s)
/* report a syntax error */
{
- error_at_line( 0, 0, rcfile, prc_lineno, "%s at %s", s,
+ report_at_line(stderr, 0, rcfile, prc_lineno, "%s at %s", s,
(yytext && yytext[0]) ? yytext : "end of input");
prc_errflag++;
}
diff --git a/report.c b/report.c
index dea48801..b986ff28 100644
--- a/report.c
+++ b/report.c
@@ -126,7 +126,7 @@ report (FILE *errfp, errnum, message, va_alist)
if (partial_message_size_used != 0)
{
partial_message_size_used = 0;
- report (errfp, 0, 0, _("%s (log message incomplete)"), partial_message);
+ report (errfp, 0, _("%s (log message incomplete)"), partial_message);
}
#if defined(HAVE_SYSLOG)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 01:15:17 +0000