some minor systematic changes.

- mark all regexps I can with /o if they can be compiled once.
- turn $o->method() into $o->method
- remove unneeded prototypes
- reduce split /re/ into split "string" where possible.

1 files changed, 2 insertions, 2 deletions

diff --git a/usr.sbin/pkg_add/pkg_merge b/usr.sbin/pkg_add/pkg_merge
index 1c66e97a77d..05dde5863bf 100644
--- a/usr.sbin/pkg_add/pkg_merge
+++ b/usr.sbin/pkg_add/pkg_merge
@@ -41,7 +41,7 @@ sub mark_tocopy
 sub copy_over
 {
 	my ($self, $wrarc, $prefix, $pkg) = @_;
-	my $e = $pkg->{pkg}->next();
+	my $e = $pkg->{pkg}->next;
 	if (!$e->check_name($self)) {
 		die "Names don't match: ", $e->{name}, " ", $self->{name};
 	}
@@ -52,7 +52,7 @@ sub copy_over
 sub make_alias
 {
 	my ($self, $wrarc, $prefix, $pkg, $alias) = @_;
-	my $e = $pkg->{pkg}->next();
+	my $e = $pkg->{pkg}->next;
 	if (!$e->check_name($self)) {
 		die "Names don't match: ", $e->{name}, " ", $self->{name};
 	}