* [PATCH 2/2] nntpd: avoid uninitialized warning
@ 2016-05-19 8:24 5% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2016-05-19 8:24 UTC (permalink / raw)
To: meta
Oops, but at least it was mostly harmless, just ugly.
Followup-to: 9bfe40e7a4ac 'nntp: use "newsgroup" instead of "name"''
---
lib/PublicInbox/NNTPD.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/PublicInbox/NNTPD.pm b/lib/PublicInbox/NNTPD.pm
index 2c84fb3..fc26c5c 100644
--- a/lib/PublicInbox/NNTPD.pm
+++ b/lib/PublicInbox/NNTPD.pm
@@ -51,7 +51,7 @@ sub refresh_groups () {
push @list, $ng;
}
}
- @list = sort { $a->{name} cmp $b->{name} } @list;
+ @list = sort { $a->{newsgroup} cmp $b->{newsgroup} } @list;
$self->{grouplist} = \@list;
# this will destroy old groups that got deleted
%{$self->{groups}} = %$new;
^ permalink raw reply related [relevance 5%]
* [PATCH] nntp: use "newsgroup" instead of "name"
@ 2016-05-14 2:56 7% Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2016-05-14 2:56 UTC (permalink / raw)
To: meta
This reduces the cognitive overhead for mapping names of
configuration values to internal field names of our classes.
Further changes along these lines coming...
---
lib/PublicInbox/NNTP.pm | 22 +++++++++++-----------
lib/PublicInbox/NewsGroup.pm | 4 ++--
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index a632148..e77ccaa 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -189,7 +189,7 @@ sub list_active ($;$) {
my ($self, $wildmat) = @_;
wildmat2re($wildmat);
foreach my $ng (@{$self->{nntpd}->{grouplist}}) {
- $ng->{name} =~ $wildmat or next;
+ $ng->{newsgroup} =~ $wildmat or next;
group_line($self, $ng);
}
}
@@ -198,9 +198,9 @@ sub list_active_times ($;$) {
my ($self, $wildmat) = @_;
wildmat2re($wildmat);
foreach my $ng (@{$self->{nntpd}->{grouplist}}) {
- $ng->{name} =~ $wildmat or next;
+ $ng->{newsgroup} =~ $wildmat or next;
my $c = eval { $ng->mm->created_at } || time;
- more($self, "$ng->{name} $c $ng->{address}");
+ more($self, "$ng->{newsgroup} $c $ng->{address}");
}
}
@@ -208,9 +208,9 @@ sub list_newsgroups ($;$) {
my ($self, $wildmat) = @_;
wildmat2re($wildmat);
foreach my $ng (@{$self->{nntpd}->{grouplist}}) {
- $ng->{name} =~ $wildmat or next;
+ $ng->{newsgroup} =~ $wildmat or next;
my $d = $ng->description;
- more($self, "$ng->{name} $d");
+ more($self, "$ng->{newsgroup} $d");
}
}
@@ -289,7 +289,7 @@ sub parse_time ($$;$) {
sub group_line ($$) {
my ($self, $ng) = @_;
my ($min, $max) = $ng->mm->minmax;
- more($self, "$ng->{name} $max $min n") if defined $min && defined $max;
+ more($self, "$ng->{newsgroup} $max $min n") if defined $min && defined $max;
}
sub cmd_newgroups ($$$;$$) {
@@ -349,8 +349,8 @@ sub cmd_newnews ($$$$;$$) {
ngpat2re($skip);
my @srch;
foreach my $ng (@{$self->{nntpd}->{grouplist}}) {
- $ng->{name} =~ $keep or next;
- $ng->{name} =~ $skip and next;
+ $ng->{newsgroup} =~ $keep or next;
+ $ng->{newsgroup} =~ $skip and next;
my $srch = $ng->search or next;
push @srch, $srch;
};
@@ -441,7 +441,7 @@ sub set_nntp_headers {
my ($hdr, $ng, $n, $mid) = @_;
# clobber some
- $hdr->header_set('Newsgroups', $ng->{name});
+ $hdr->header_set('Newsgroups', $ng->{newsgroup});
$hdr->header_set('Xref', xref($ng, $n));
header_append($hdr, 'List-Post', "<mailto:$ng->{address}>");
if (my $url = $ng->{url}) {
@@ -670,7 +670,7 @@ sub hdr_message_id ($$$) { # optimize XHDR Message-ID [range] for slrnpull.
sub xref ($$) {
my ($ng, $n) = @_;
- "$ng->{domain} $ng->{name}:$n"
+ "$ng->{domain} $ng->{newsgroup}:$n"
}
sub mid_lookup ($$) {
@@ -894,7 +894,7 @@ sub cmd_xpath ($$) {
my @paths;
foreach my $ng (values %{$self->{nntpd}->{groups}}) {
my $n = $ng->mm->num_for($mid);
- push @paths, "$ng->{name}/$n" if defined $n;
+ push @paths, "$ng->{newsgroup}/$n" if defined $n;
}
return '430 no such article on server' unless @paths;
'223 '.join(' ', @paths);
diff --git a/lib/PublicInbox/NewsGroup.pm b/lib/PublicInbox/NewsGroup.pm
index 98a3595..500f61e 100644
--- a/lib/PublicInbox/NewsGroup.pm
+++ b/lib/PublicInbox/NewsGroup.pm
@@ -13,7 +13,7 @@ require PublicInbox::Search;
require PublicInbox::Git;
sub new {
- my ($class, $name, $git_dir, $address, $url) = @_;
+ my ($class, $newsgroup, $git_dir, $address, $url) = @_;
# first email address is preferred
$address = $address->[0] if ref($address);
@@ -24,7 +24,7 @@ sub new {
$url .= '/' if $url !~ m!/\z!;
}
my $self = bless {
- name => $name,
+ newsgroup => $newsgroup,
git_dir => $git_dir,
address => $address,
url => $url,
^ permalink raw reply related [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-05-14 2:56 7% [PATCH] nntp: use "newsgroup" instead of "name" Eric Wong
2016-05-19 8:24 nntpd: various bug fixes Eric Wong
2016-05-19 8:24 5% ` [PATCH 2/2] nntpd: avoid uninitialized warning Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).