summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2007-05-26 12:15:45 +0000
committerespie <espie@openbsd.org>2007-05-26 12:15:45 +0000
commit76fe8dcb6da7c5eb4bfa2ed6a32b8b69934198b1 (patch)
treeadd2fde0fcdd4cb56d09d026ecf9424f4f6383e3
parentDe-common a few variables by moving the definition into a .c file. (diff)
downloadwireguard-openbsd-76fe8dcb6da7c5eb4bfa2ed6a32b8b69934198b1.tar.xz
wireguard-openbsd-76fe8dcb6da7c5eb4bfa2ed6a32b8b69934198b1.zip
give a more descriptive name to function, we're past abreviations
-rw-r--r--usr.sbin/pkg_add/pkg_add9
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index b4fc1b881b1..40b1e49969a 100644
--- a/usr.sbin/pkg_add/pkg_add
+++ b/usr.sbin/pkg_add/pkg_add
@@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: pkg_add,v 1.265 2007/05/25 13:25:50 espie Exp $
+# $OpenBSD: pkg_add,v 1.266 2007/05/26 12:15:45 espie Exp $
#
# Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
#
@@ -196,8 +196,9 @@ sub can_install
}
-# This does pre_add a package: finding it and reading its package information
-sub pre_add
+# This does prepare_to_add a package: finding it and reading its
+# package information
+sub prepare_to_add
{
my ($pkg, $state, $handle) = @_;
@@ -523,7 +524,7 @@ sub install_package
my $handle = OpenBSD::Handle->new;
if (!defined $cache->{$pkg}) {
- $cache->{$pkg} = pre_add($pkg, $state, $handle);
+ $cache->{$pkg} = prepare_to_add($pkg, $state, $handle);
}
my $location = $cache->{$pkg};