From: Eric Wong <e@yhbt.net>
Date: Fri, 28 Aug 2020 10:12:59 +0000 (+0000)
Subject: imaptracker: update_last: simplify callers
X-Git-Tag: v1.6.0~75
X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=commitdiff_plain;h=64f4a7c22d570097f316a5cbaf25b99a412bf54d

imaptracker: update_last: simplify callers

By making it a no-op if last_uid is not defined.  This isn't a
hot code path, so the extra method dispatch isn't an issue.
It'll save some indentation/wrapping in future commits.
---

diff --git a/lib/PublicInbox/IMAPTracker.pm b/lib/PublicInbox/IMAPTracker.pm
index 92f21584..be9caf76 100644
--- a/lib/PublicInbox/IMAPTracker.pm
+++ b/lib/PublicInbox/IMAPTracker.pm
@@ -49,13 +49,14 @@ SELECT uid_validity, uid FROM imap_last WHERE url = ?
 }
 
 sub update_last ($$$) {
-	my ($self, $validity, $last) = @_;
+	my ($self, $validity, $last_uid) = @_;
+	return unless defined $last_uid;
 	my $sth = $self->{dbh}->prepare_cached(<<'');
 INSERT OR REPLACE INTO imap_last (url, uid_validity, uid)
 VALUES (?, ?, ?)
 
 	$self->lock_acquire;
-	my $rv = $sth->execute($self->{url}, $validity, $last);
+	my $rv = $sth->execute($self->{url}, $validity, $last_uid);
 	$self->lock_release;
 	$rv;
 }
diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 78aec8a2..a227a6fd 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -494,7 +494,7 @@ sub imap_fetch_all ($$$) {
 			last if $self->{quit};
 		}
 		_done_for_now($self);
-		$itrk->update_last($r_uidval, $last_uid) if defined $last_uid;
+		$itrk->update_last($r_uidval, $last_uid);
 	} until ($err || $self->{quit});
 	$err;
 }
@@ -919,7 +919,7 @@ sub nntp_fetch_all ($$$) {
 		$last_art = $art;
 	}
 	_done_for_now($self);
-	$itrk->update_last(0, $last_art) if defined $last_art;
+	$itrk->update_last(0, $last_art);
 	$err;
 }