[interchange-cvs] interchange - jon modified lib/Vend/Util.pm

interchange-core@interchange.redhat.com interchange-core@interchange.redhat.com
Thu Nov 15 11:43:00 2001


User:      jon
Date:      2001-11-15 16:42:55 GMT
Modified:  lib/Vend Tag: STABLE_4_8-branch Util.pm
Log:
Remove mysterious phantom code duplication from Mike's bugfix commit.

Revision  Changes    Path
No                   revision



No                   revision



2.1.2.3   +2 -21     interchange/lib/Vend/Util.pm


rev 2.1.2.3, prev_rev 2.1.2.2
Index: Util.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Util.pm,v
retrieving revision 2.1.2.2
retrieving revision 2.1.2.3
diff -u -u -r2.1.2.2 -r2.1.2.3
--- Util.pm	2001/11/15 11:12:54	2.1.2.2
+++ Util.pm	2001/11/15 16:42:55	2.1.2.3
@@ -1,6 +1,6 @@
 # Vend::Util - Interchange utility functions
 #
-# $Id: Util.pm,v 2.1.2.2 2001/11/15 11:12:54 mheins Exp $
+# $Id: Util.pm,v 2.1.2.3 2001/11/15 16:42:55 jon Exp $
 # 
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -74,7 +74,7 @@
 use Errno;
 use subs qw(logError logGlobal);
 use vars qw($VERSION @EXPORT @EXPORT_OK);
-$VERSION = substr(q$Revision: 2.1.2.2 $, 10);
+$VERSION = substr(q$Revision: 2.1.2.3 $, 10);
 
 BEGIN {
 	eval {
@@ -200,25 +200,6 @@
 	elsif ( $Vend::Cfg->{Locale} ) {
 		$digits = $Vend::Cfg->{Locale}{frac_digits};
 		$digits = 2 if ! defined $digits;
-	}
-	else {
-		$digits = 2;
-	}
-	my @frac;
-	$num =~ /^(\d*)\.(\d+)$/
-		or return $num;
-	my $int = $1;
-	@frac = split //, $2;
-	local($^W) = 0;
-	my $frac = join "", @frac[0 .. $digits - 1];
-	if($frac[$digits] > 4) {
-		$frac++;
-	}
-	if(length($frac) > $digits) {
-		$int++;
-		$frac = 0 x $digits;
-	}
-	$frac .= '0' while length($frac) < $digits;
 	}
 	else {
 		$digits = 2;