gc really old code

2 files changed, 5 insertions, 15 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm b/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm
index be101bdf548..2ecd6583ae5 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackageLocation.pm,v 1.35 2014/01/30 18:54:34 espie Exp $
+# $OpenBSD: PackageLocation.pm,v 1.36 2014/02/02 23:09:56 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -112,7 +112,7 @@ sub find_contents
 {
 	my ($self, $extra) = @_;
 
-	while (my $e = $self->_next) {
+	while (my $e = $self->next) {
 		if ($e->isFile && is_info_name($e->{name})) {
 			if ($e->{name} eq CONTENTS ) {
 				my $v = $e->contents($extra);
@@ -162,7 +162,7 @@ sub grab_info
 		close $fh;
 	}
 
-	while (my $e = $self->_next) {
+	while (my $e = $self->next) {
 		if ($e->isFile && is_info_name($e->{name})) {
 			$e->{name} = $dir.$e->{name};
 			undef $e->{mtime};
@@ -289,16 +289,6 @@ sub next
 {
 	my $self = shift;
 
-	if (!defined $self->{dir}) {
-		$self->grabInfoFiles;
-	}
-	return $self->_next;
-}
-
-sub _next
-{
-	my $self = shift;
-
 	if (!$self->_opened) {
 		return;
 	}
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm
index 5494de81ffa..c6aaf602418 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackageRepository.pm,v 1.104 2014/01/30 13:18:10 espie Exp $
+# $OpenBSD: PackageRepository.pm,v 1.105 2014/02/02 23:09:56 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
@@ -537,7 +537,7 @@ sub finish_and_close
 {
 	my ($self, $object) = @_;
 	if (defined $object->{cache_dir}) {
-		while (defined $object->_next) {
+		while (defined $object->next) {
 		}
 	}
 	$self->SUPER::finish_and_close($object);