From 57c1f57e375047c2b6887d06418bb7533d7a666c Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sun, 4 Jan 2015 14:10:20 +0000
Subject: [PATCH] too many todo. Use unambiguous names, since they're not the
 same operation at all

---
 usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm | 4 ++--
 usr.sbin/pkg_add/OpenBSD/AddDelete.pm       | 4 ++--
 usr.sbin/pkg_add/OpenBSD/Signer.pm          | 4 ++--
 usr.sbin/pkg_add/OpenBSD/Ustar.pm           | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm b/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm
index c9ba25d679c..670728fc265 100644
--- a/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm
+++ b/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: AddCreateDelete.pm,v 1.27 2014/11/30 15:56:15 espie Exp $
+# $OpenBSD: AddCreateDelete.pm,v 1.28 2015/01/04 14:10:20 espie Exp $
 #
 # Copyright (c) 2007-2014 Marc Espie <espie@openbsd.org>
 #
@@ -142,7 +142,7 @@ sub ntogo_string
 {
 	my ($self, $offset) = @_;
 
-	return $self->todo($offset // 0);
+	return $self->ntodo($offset // 0);
 }
 
 OpenBSD::Auto::cache(signer_list,
diff --git a/usr.sbin/pkg_add/OpenBSD/AddDelete.pm b/usr.sbin/pkg_add/OpenBSD/AddDelete.pm
index 2d72ea65e6d..17ad476f23e 100644
--- a/usr.sbin/pkg_add/OpenBSD/AddDelete.pm
+++ b/usr.sbin/pkg_add/OpenBSD/AddDelete.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: AddDelete.pm,v 1.69 2014/12/03 22:41:11 espie Exp $
+# $OpenBSD: AddDelete.pm,v 1.70 2015/01/04 14:10:20 espie Exp $
 #
 # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org>
 #
@@ -220,7 +220,7 @@ sub syslog
 	Sys::Syslog::syslog('info', $self->f(@_));
 }
 
-sub todo
+sub ntodo
 {
 	my ($state, $offset) = @_;
 	return $state->tracker->sets_todo($offset);
diff --git a/usr.sbin/pkg_add/OpenBSD/Signer.pm b/usr.sbin/pkg_add/OpenBSD/Signer.pm
index 0e6f5a31b57..9415bcadf5d 100644
--- a/usr.sbin/pkg_add/OpenBSD/Signer.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Signer.pm
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 # ex:ts=8 sw=4:
-# $OpenBSD: Signer.pm,v 1.5 2014/09/20 09:04:31 espie Exp $
+# $OpenBSD: Signer.pm,v 1.6 2015/01/04 14:10:20 espie Exp $
 #
 # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
 #
@@ -174,7 +174,7 @@ sub add_signature
 	$sig->{b64sig} = $state->{signer}->compute_signature($state, $plist);
 }
 
-sub todo
+sub ntodo
 {
 	my ($self, $offset) = @_;
 	return sprintf("%u/%u", $self->{done}-$offset, $self->{total});
diff --git a/usr.sbin/pkg_add/OpenBSD/Ustar.pm b/usr.sbin/pkg_add/OpenBSD/Ustar.pm
index 3972b4b7acc..fbea010b0df 100644
--- a/usr.sbin/pkg_add/OpenBSD/Ustar.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Ustar.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Ustar.pm,v 1.85 2014/11/20 11:39:29 espie Exp $
+# $OpenBSD: Ustar.pm,v 1.86 2015/01/04 14:10:20 espie Exp $
 #
 # Copyright (c) 2002-2014 Marc Espie <espie@openbsd.org>
 #
@@ -512,7 +512,7 @@ sub errsay
 	my ($self, @args) = @_;
 	$self->{archive}{state}->errsay(@args);
 }
-sub todo
+sub left_todo
 {
 	my ($self, $toread) = @_;
 	return if $toread == 0;
@@ -840,7 +840,7 @@ sub create
 		}
 
 		$toread -= $actual;
-		$self->todo($toread);
+		$self->left_todo($toread);
 	}
 	$out->close or $self->fatal("Error closing #1#2: #3",
 	    $self->{destdir}, $self->name, $!);
@@ -907,7 +907,7 @@ sub write_contents
 		}
 
 		$toread -= $actual;
-		$self->todo($toread);
+		$self->left_todo($toread);
 	}
 	if ($size % 512) {
 		print $out "\0" x (512 - $size % 512) or
-- 
2.20.1