diff options
| author |   espie <espie@openbsd.org> | 2013-12-23 15:04:37 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2013-12-23 15:04:37 +0000 |
| commit | b3728a1ddfa3554adbba17c8ae3da17457a1f625 (patch) | |
| tree | 03c70bdf2b45f9a5e5c691b23f32359b50a80d6c | |
| parent | Move findbuffer() to buffer.c. (diff) | |
| download | wireguard-openbsd-b3728a1ddfa3554adbba17c8ae3da17457a1f625.tar.xz wireguard-openbsd-b3728a1ddfa3554adbba17c8ae3da17457a1f625.zip | |
real fix: turns out visit_with_* are transparent, e.g., pass all their
parameters to the end consumer. Make sure the !Term version obeys that too.
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/ProgressMeter.pm | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/ProgressMeter/Term.pm | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/ProgressMeter.pm b/usr.sbin/pkg_add/OpenBSD/ProgressMeter.pm index 45491216526..8cad902c589 100644 --- a/usr.sbin/pkg_add/OpenBSD/ProgressMeter.pm +++ b/usr.sbin/pkg_add/OpenBSD/ProgressMeter.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: ProgressMeter.pm,v 1.39 2013/12/23 13:29:41 espie Exp $ +# $OpenBSD: ProgressMeter.pm,v 1.40 2013/12/23 15:04:37 espie Exp $ # # Copyright (c) 2010 Marc Espie <espie@openbsd.org> # @@ -84,7 +84,7 @@ sub ntogo sub visit_with_size { - my ($progress, $plist, $method, $state, @r) = @_; + my ($progress, $plist, $method, @r) = @_; $plist->$method(@r); } diff --git a/usr.sbin/pkg_add/OpenBSD/ProgressMeter/Term.pm b/usr.sbin/pkg_add/OpenBSD/ProgressMeter/Term.pm index 5464c179014..4bd9550ba91 100644 --- a/usr.sbin/pkg_add/OpenBSD/ProgressMeter/Term.pm +++ b/usr.sbin/pkg_add/OpenBSD/ProgressMeter/Term.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Term.pm,v 1.18 2013/12/23 14:03:58 espie Exp $ +# $OpenBSD: Term.pm,v 1.19 2013/12/23 15:04:37 espie Exp $ # # Copyright (c) 2004-2007 Marc Espie <espie@openbsd.org> # @@ -20,7 +20,7 @@ use warnings; package OpenBSD::PackingElement; sub size_and { - my ($self, $progress, $donesize, $totsize, $method, $state, @r) = @_; + my ($self, $progress, $donesize, $totsize, $method, @r) = @_; if (defined $self->{size}) { $$donesize += $self->{size}; $progress->show($$donesize, $totsize); @@ -95,12 +95,12 @@ sub visit_with_size sub visit_with_count { - my ($progress, $plist, $method, $state, @r) = @_; + my ($progress, $plist, $method, @r) = @_; $plist->{total} //= compute_count($plist); my $count = 0; $progress->show($count, $plist->{total}); $plist->count_and($progress, \$count, $plist->{total}, - $method, $state, @r); + $method, @r); } package OpenBSD::ProgressMeter::Term; |