[interchange] Use get_hash error API instead of $@ at a distance

[Jon Jensen]

commit 77653a226cee076407818d6ebb9a24f695d4ecd8
Author: Jon Jensen <jon at endpoint.com>
Date:   Wed Nov 1 19:12:25 2017 -0600

    Use get_hash error API instead of $@ at a distance

 lib/Vend/UserControl.pm |    8 ++++----
 lib/Vend/UserDB.pm      |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/lib/Vend/UserControl.pm b/lib/Vend/UserControl.pm
index 8b903f7..5467035 100644
--- a/lib/Vend/UserControl.pm
+++ b/lib/Vend/UserControl.pm
@@ -1,6 +1,6 @@
 # Vend::UserControl - Enhanced Interchange user database functions
 #
-# Copyright (C) 2003-2007 Interchange Development Group
+# Copyright (C) 2003-2017 Interchange Development Group
 # Copyright (C) 2003 Mike Heins, <mikey at heins.net>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 
 package Vend::UserControl;
 
-$VERSION = substr(q$Revision: 2.6 $, 10);
+$VERSION = '2.7';
 
 require Vend::UserDB;
 use Vend::Data;
@@ -193,8 +193,8 @@ sub get_values {
 	foreach $area (qw!PREFERENCES CARTS!) {
 		my $f = $location->{$area};
 		if ($present->{$f}) {
-			my $s = $self->get_hash($area);
-			die ::errmsg("Bad structure in %s: %s", $f, $@) if $@;
+			my $s = $self->get_hash($area)
+                or die ::errmsg("Bad structure in %s: %s", $f, $self->{ERROR});
 			$::Values->{$f} = join "\n", sort keys %$s;
 		}
 	}
diff --git a/lib/Vend/UserDB.pm b/lib/Vend/UserDB.pm
index 941452c..b861ad4 100644
--- a/lib/Vend/UserDB.pm
+++ b/lib/Vend/UserDB.pm
@@ -1171,8 +1171,8 @@ sub get_values {
 	foreach $area (qw!SHIPPING BILLING PREFERENCES CARTS!) {
 		my $f = $self->{LOCATION}->{$area};
 		if ($self->{PRESENT}->{$f}) {
-			my $s = $self->get_hash($area);
-			die errmsg("Bad structure in %s: %s", $f, $@) if $@;
+			my $s = $self->get_hash($area)
+				or die errmsg("Bad structure in %s: %s", $f, $self->{ERROR});
 			$::Values->{$f} = join "\n", sort keys %$s;
 		}
 	}