From: Eric Wong <e@80x24.org>
Date: Thu, 29 May 2025 00:20:29 +0000 (+0000)
Subject: xhc_mset: improve error message formatting
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21823a35c0113d36719e24045dea69378ac57bb2;p=thirdparty%2Fpublic-inbox.git

xhc_mset: improve error message formatting

We don't need extra linefeeds before the `)' in the stderr
output, and the context from croak() is bogus anyways since we
get error messages from an external process.
---

diff --git a/lib/PublicInbox/XhcMset.pm b/lib/PublicInbox/XhcMset.pm
index d6dc877f9..fd359d091 100644
--- a/lib/PublicInbox/XhcMset.pm
+++ b/lib/PublicInbox/XhcMset.pm
@@ -10,7 +10,6 @@ use PublicInbox::IO qw(read_all);
 use PublicInbox::XhcMsetIterator;
 use PublicInbox::Syscall qw(EPOLLIN EPOLLONESHOT);
 use Fcntl qw(SEEK_SET);
-use Carp qw(croak);
 use PublicInbox::Git qw(git_quote);
 
 sub die_err ($@) {
@@ -19,7 +18,7 @@ sub die_err ($@) {
 	seek $err_rw, 0, SEEK_SET;
 	my $s = read_all $err_rw;
 	chomp $s;
-	croak $s, @msg;
+	die $s, @msg, "\n";
 }
 
 sub event_step {
@@ -41,7 +40,7 @@ sub event_step {
 		scalar(@it) == $size or die_err $self,
 			'got ', scalar(@it), ', expected mset.size=', $size;
 	};
-	my $err = $@;
+	chomp(my $err = $@);
 	$self->close;
 	eval { $cb->(@args, $self, $err) };
 	warn "E: $@\n" if $@;