Send inn-committers mailing list submissions to
inn-committers@lists.isc.org
To subscribe or unsubscribe via the World Wide Web, visit
https://lists.isc.org/mailman/listinfo/inn-committers
or, via email, send a message with subject or body 'help' to
inn-committers-requ...@lists.isc.org
You can reach the person managing the list at
inn-committers-ow...@lists.isc.org
When replying, please edit your Subject line so it is more specific
than "Re: Contents of inn-committers digest..."
Today's Topics:
1. INN commit: trunk/scripts (innreport_inn.pm) (INN Commit)
2. INN commit: branches/2.5/scripts (innreport_inn.pm) (INN Commit)
3. INN commit: trunk/innd (art.c) (INN Commit)
4. INN commit: trunk (innd/python.c lib/perl.c nnrpd/python.c)
(INN Commit)
5. INN commit: trunk (7 files) (INN Commit)
----------------------------------------------------------------------
Message: 1
Date: Mon, 9 Dec 2013 10:27:16 -0800 (PST)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk/scripts (innreport_inn.pm)
Message-ID: <20131209182716.e3ca567...@hope.eyrie.org>
Date: Monday, December 9, 2013 @ 10:27:16
Author: iulius
Revision: 9578
innreport: update the pattern for "strange strings"
The "Including strange strings" innreport section is now back
in daily Usenet reports.
Fix regression introduced with commit [8389].
Modified:
trunk/scripts/innreport_inn.pm
------------------+
innreport_inn.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: innreport_inn.pm
===================================================================
--- innreport_inn.pm 2013-12-06 03:54:44 UTC (rev 9577)
+++ innreport_inn.pm 2013-12-09 18:27:16 UTC (rev 9578)
@@ -422,8 +422,8 @@
$inn_badart{$server}++;
return 1;
}
- # 437 article includes "....."
- if ($left =~ /(\S+) <[^>]+> (?:437|439) article includes/o) {
+ # Article accepted but includes "....."
+ if ($left =~ /(\S+) <[^>]+> Article accepted but includes/o) {
my $server = $1;
$server = lc $server unless $CASE_SENSITIVE;
$innd_strange_strings{$server}++;
------------------------------
Message: 2
Date: Mon, 9 Dec 2013 10:28:12 -0800 (PST)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: branches/2.5/scripts (innreport_inn.pm)
Message-ID: <20131209182812.1cd3067...@hope.eyrie.org>
Date: Monday, December 9, 2013 @ 10:28:11
Author: iulius
Revision: 9579
innreport: update the pattern for "strange strings"
The "Including strange strings" innreport section is now back
in daily Usenet reports.
Fix regression introduced with commit [8389].
Modified:
branches/2.5/scripts/innreport_inn.pm
------------------+
innreport_inn.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: innreport_inn.pm
===================================================================
--- innreport_inn.pm 2013-12-09 18:27:16 UTC (rev 9578)
+++ innreport_inn.pm 2013-12-09 18:28:11 UTC (rev 9579)
@@ -422,8 +422,8 @@
$inn_badart{$server}++;
return 1;
}
- # 437 article includes "....."
- if ($left =~ /(\S+) <[^>]+> (?:437|439) article includes/o) {
+ # Article accepted but includes "....."
+ if ($left =~ /(\S+) <[^>]+> Article accepted but includes/o) {
my $server = $1;
$server = lc $server unless $CASE_SENSITIVE;
$innd_strange_strings{$server}++;
------------------------------
Message: 3
Date: Mon, 9 Dec 2013 10:30:39 -0800 (PST)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk/innd (art.c)
Message-ID: <20131209183039.e2dbc67...@hope.eyrie.org>
Date: Monday, December 9, 2013 @ 10:30:39
Author: iulius
Revision: 9580
innd: write the first character in uppercase for error messages
Modified:
trunk/innd/art.c
-------+
art.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: art.c
===================================================================
--- art.c 2013-12-09 18:28:11 UTC (rev 9579)
+++ art.c 2013-12-09 18:30:39 UTC (rev 9580)
@@ -1999,7 +1999,7 @@
}
hopcount = ARTparsepath(HDR(HDR__PATH), HDR_LEN(HDR__PATH), &data->Path);
if (hopcount == 0) {
- snprintf(cp->Error, sizeof(cp->Error), "%d illegal path element",
+ snprintf(cp->Error, sizeof(cp->Error), "%d Illegal path element",
ihave ? NNTP_FAIL_IHAVE_REJECT : NNTP_FAIL_TAKETHIS_REJECT);
/* We do not remember the message-ID of this article because another
* peer may send it with a good Path: header. */
@@ -2139,7 +2139,7 @@
/* If we limit what distributions we get, see if we want this one. */
if (HDR_FOUND(HDR__DISTRIBUTION)) {
if (HDR(HDR__DISTRIBUTION)[0] == ',') {
- snprintf(cp->Error, sizeof(cp->Error), "%d bogus distribution \"%s\"",
+ snprintf(cp->Error, sizeof(cp->Error), "%d Bogus distribution \"%s\"",
ihave ? NNTP_FAIL_IHAVE_REJECT : NNTP_FAIL_TAKETHIS_REJECT,
MaxLength(HDR(HDR__DISTRIBUTION), HDR(HDR__DISTRIBUTION)));
ARTlog(data, ART_REJECT, cp->Error);
@@ -2523,7 +2523,7 @@
}
if (token.type == TOKEN_EMPTY) {
syslog(L_ERROR, "%s cant store article: %s", LogName, SMerrorstr);
- snprintf(cp->Error, sizeof(cp->Error), "%d cant store article",
+ snprintf(cp->Error, sizeof(cp->Error), "%d Can't store article",
ihave ? NNTP_FAIL_IHAVE_DEFER : NNTP_FAIL_ACTION);
/* Do not remember the message-ID of the article because we want
* it to be received again later. */
@@ -2564,7 +2564,7 @@
i = errno;
syslog(L_ERROR, "%s cant write history %s %m", LogName,
HDR(HDR__MESSAGE_ID));
- snprintf(cp->Error, sizeof(cp->Error), "%d cant write history, %s",
+ snprintf(cp->Error, sizeof(cp->Error), "%d Can't write history, %s",
ihave ? NNTP_FAIL_IHAVE_DEFER : NNTP_FAIL_ACTION,
strerror(errno));
ARTlog(data, ART_REJECT, cp->Error);
------------------------------
Message: 4
Date: Mon, 9 Dec 2013 12:07:04 -0800 (PST)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk (innd/python.c lib/perl.c nnrpd/python.c)
Message-ID: <20131209200704.1813e67...@hope.eyrie.org>
Date: Monday, December 9, 2013 @ 12:07:03
Author: iulius
Revision: 9581
Properly log as notice level Perl and Python hooks by default.
Modified:
trunk/innd/python.c
trunk/lib/perl.c
trunk/nnrpd/python.c
----------------+
innd/python.c | 2 +-
lib/perl.c | 2 +-
nnrpd/python.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Modified: innd/python.c
===================================================================
--- innd/python.c 2013-12-09 18:30:39 UTC (rev 9580)
+++ innd/python.c 2013-12-09 20:07:03 UTC (rev 9581)
@@ -444,7 +444,6 @@
/* Assign syslog priority by abbreviated names. */
switch (*loglevel) {
- default: priority = LOG_NOTICE ;
case 'd': case 'D': priority = LOG_DEBUG ; break;
case 'i': case 'I': priority = LOG_INFO ; break;
case 'n': case 'N': priority = LOG_NOTICE ; break;
@@ -452,6 +451,7 @@
case 'e': case 'E': priority = LOG_ERR ; break;
case 'c': case 'C': priority = LOG_CRIT ; break;
case 'a': case 'A': priority = LOG_ALERT ; break;
+ default: priority = LOG_NOTICE ;
}
/* Log the message. */
Modified: lib/perl.c
===================================================================
--- lib/perl.c 2013-12-09 18:30:39 UTC (rev 9580)
+++ lib/perl.c 2013-12-09 20:07:03 UTC (rev 9581)
@@ -419,7 +419,6 @@
logmsg = (const char *) SvPV(ST(1), PL_na);
switch (*loglevel) {
- default: priority = LOG_NOTICE;
case 'a': case 'A': priority = LOG_ALERT; break;
case 'c': case 'C': priority = LOG_CRIT; break;
case 'e': case 'E': priority = LOG_ERR; break;
@@ -427,6 +426,7 @@
case 'n': case 'N': priority = LOG_NOTICE; break;
case 'i': case 'I': priority = LOG_INFO; break;
case 'd': case 'D': priority = LOG_DEBUG; break;
+ default: priority = LOG_NOTICE;
}
syslog(priority, "filter: %s", logmsg);
XSRETURN_UNDEF;
Modified: nnrpd/python.c
===================================================================
--- nnrpd/python.c 2013-12-09 18:30:39 UTC (rev 9580)
+++ nnrpd/python.c 2013-12-09 20:07:03 UTC (rev 9581)
@@ -558,7 +558,6 @@
/* Assign syslog priority by abbreviated names. */
switch (*loglevel) {
- default: priority = LOG_NOTICE ;
case 'd': case 'D': priority = LOG_DEBUG ; break;
case 'i': case 'I': priority = LOG_INFO ; break;
case 'n': case 'N': priority = LOG_NOTICE ; break;
@@ -566,6 +565,7 @@
case 'e': case 'E': priority = LOG_ERR ; break;
case 'c': case 'C': priority = LOG_CRIT ; break;
case 'a': case 'A': priority = LOG_ALERT ; break;
+ default: priority = LOG_NOTICE ;
}
/* Log the message. */
------------------------------
Message: 5
Date: Mon, 9 Dec 2013 13:30:42 -0800 (PST)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk (7 files)
Message-ID: <20131209213042.7b5ac67...@hope.eyrie.org>
Date: Monday, December 9, 2013 @ 13:30:42
Author: iulius
Revision: 9582
Fix a few useless assignments (never read) reported by clang
Modified:
trunk/innd/chan.c
trunk/innd/nc.c
trunk/innd/rc.c
trunk/lib/conffile.c
trunk/nnrpd/article.c
trunk/nnrpd/commands.c
trunk/storage/buffindexed/buffindexed.c
-----------------------------------+
innd/chan.c | 2 +-
innd/nc.c | 9 ++++-----
innd/rc.c | 10 +++-------
lib/conffile.c | 6 ++----
nnrpd/article.c | 1 -
nnrpd/commands.c | 4 ++--
storage/buffindexed/buffindexed.c | 3 ++-
7 files changed, 14 insertions(+), 21 deletions(-)
Modified: innd/chan.c
===================================================================
--- innd/chan.c 2013-12-09 20:07:03 UTC (rev 9581)
+++ innd/chan.c 2013-12-09 21:30:42 UTC (rev 9582)
@@ -539,7 +539,7 @@
CHANiter(int *ip, enum channel_type type)
{
CHANNEL *cp;
- int i = *ip;
+ int i;
for (i = *ip; i >= 0 && i < channels.table_size; i++) {
cp = &channels.table[i];
Modified: innd/nc.c
===================================================================
--- innd/nc.c 2013-12-09 20:07:03 UTC (rev 9581)
+++ innd/nc.c 2013-12-09 21:30:42 UTC (rev 9582)
@@ -1088,7 +1088,6 @@
bool validcommandtoolong;
int syntaxerrorcode = NNTP_ERR_SYNTAX;
- readmore = movedata = false;
if (Tracing || cp->Tracing)
syslog(L_TRACE, "%s NCproc Used=%lu", CHANname(cp),
(unsigned long) cp->In.used);
@@ -1604,7 +1603,6 @@
if (movedata) { /* move data rather than extend buffer */
TMRstart(TMR_DATAMOVE);
- movedata = false;
if (cp->Start > 0)
memmove(bp->data, &bp->data[cp->Start], bp->used - cp->Start);
bp->used -= cp->Start;
@@ -1625,9 +1623,10 @@
cp->Start = 0;
TMRstop(TMR_DATAMOVE);
}
- if (readmore)
- /* need to read more */
- break;
+ if (readmore) {
+ /* need to read more */
+ break;
+ }
}
}
Modified: innd/rc.c
===================================================================
--- innd/rc.c 2013-12-09 20:07:03 UTC (rev 9581)
+++ innd/rc.c 2013-12-09 21:30:42 UTC (rev 9582)
@@ -662,7 +662,6 @@
char *s;
char *t;
char *word;
- bool flag;
*toolong = false;
if (*RCbuff == '\0') {
@@ -674,7 +673,6 @@
return (NULL); /* Line too long */
}
}
- p = RCbuff;
do {
/* Ignore blank and comment lines. */
if ((p = strchr(RCbuff, '\n')) != NULL)
@@ -684,19 +682,17 @@
*p = '\0';
}
for (p = RCbuff; *p == ' ' || *p == '\t' ; p++);
- flag = true;
if (*p == '\0' && !feof (F)) {
- flag = false;
fgets(RCbuff, sizeof RCbuff, F);
(*num)++;
if (strlen (RCbuff) == sizeof RCbuff) {
- *toolong = true;
- return (NULL); /* Line too long */
+ *toolong = true;
+ return (NULL); /* Line too long */
}
continue;
}
break;
- } while (!feof (F) || !flag);
+ } while (!feof (F));
if (*p == '"') { /* double quoted string ? */
p++;
Modified: lib/conffile.c
===================================================================
--- lib/conffile.c 2013-12-09 20:07:03 UTC (rev 9581)
+++ lib/conffile.c 2013-12-09 21:30:42 UTC (rev 9582)
@@ -41,7 +41,7 @@
char *s;
char *t;
char *word;
- bool flag, comment;
+ bool comment;
if (!F) return (NULL); /* No conf file */
if (!F->buf || !F->buf[0]) {
@@ -58,15 +58,13 @@
if ((p = strchr(F->buf, '\n')) != NULL)
*p = '\0';
for (p = F->buf; *p == ' ' || *p == '\t' ; p++);
- flag = true;
if ((*p == '\0' || *p == '#') && !cfeof(F)) {
- flag = false;
if (getconfline(F, F->buf, F->sbuf))
return (NULL); /* Line too long */
continue;
}
break;
- } while (!cfeof(F) || !flag);
+ } while (!cfeof(F));
comment = false;
if (*p == '"') { /* double quoted string ? */
Modified: nnrpd/article.c
===================================================================
--- nnrpd/article.c 2013-12-09 20:07:03 UTC (rev 9581)
+++ nnrpd/article.c 2013-12-09 21:30:42 UTC (rev 9582)
@@ -675,7 +675,6 @@
PERMcanauthenticate ? NNTP_FAIL_AUTH_NEEDED :
NNTP_ERR_ACCESS);
return;
}
- tart=art;
Reply("%d %lu %s %s\r\n", what->ReplyCode, art, av[1], what->Item);
if (what->Type != STstat) {
ARTsendmmap(what->Type);
Modified: nnrpd/commands.c
===================================================================
--- nnrpd/commands.c 2013-12-09 20:07:03 UTC (rev 9581)
+++ nnrpd/commands.c 2013-12-09 21:30:42 UTC (rev 9582)
@@ -197,7 +197,7 @@
}
close(pan[PIPE_WRITE]);
- i = read(pan[PIPE_READ], path, sizeof(path));
+ read(pan[PIPE_READ], path, sizeof(path));
waitpid(pid, &status, 0);
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
@@ -254,7 +254,7 @@
/* Go on parsing the command line. */
ac--;
- ac += reArgify(av[ac], &av[ac], -1, true);
+ (void) reArgify(av[ac], &av[ac], -1, true);
strlcpy(PERMuser, "<none>", sizeof(PERMuser));
Modified: storage/buffindexed/buffindexed.c
===================================================================
--- storage/buffindexed/buffindexed.c 2013-12-09 20:07:03 UTC (rev 9581)
+++ storage/buffindexed/buffindexed.c 2013-12-09 21:30:42 UTC (rev 9582)
@@ -2237,7 +2237,7 @@
void buffindexed_close(void) {
struct stat sb;
- OVBUFF *ovbuff = ovbufftab;
+ OVBUFF *ovbuff = NULL;
#ifdef OV_DEBUG
FILE *F = NULL;
pid_t pid;
@@ -2249,6 +2249,7 @@
#endif /* OV_DEBUG */
#ifdef OV_DEBUG
+ ovbuff = ovbufftab;
for (; ovbuff != (OVBUFF *)NULL; ovbuff = ovbuff->next) {
for (i = 0 ; i < ovbuff->totalblk ; i++) {
trace = &ovbuff->trace[i];
------------------------------
_______________________________________________
inn-committers mailing list
inn-committers@lists.isc.org
https://lists.isc.org/mailman/listinfo/inn-committers
End of inn-committers Digest, Vol 58, Issue 2
*********************************************
