Remove redudant code.

git-svn-id: file:///svnroot/renrot/branches/andy@559 fe2816f4-e837-0410-b10a-f608c9d244a1

1 files changed, 0 insertions, 38 deletions

diff --git a/renrot b/renrot
index 44738d6..bf6e374 100755
--- a/renrot
+++ b/renrot
@@ -731,41 +731,6 @@ sub parseConfig {
 }
 
 ########################################################################################
-# Usage      : dirConv($dir_str)
-# Purpose    : removes dotslashes, heading dotslash and trailing slashes
-# Returns    : directory name without dotslashes, heading dotslash and trailing slashes
-# Parameters : [string] $dir_str
-# Throws     : no exceptions
-# Comments   : none
-# See Also   : N/A
-sub dirConv {
-  my $dirStr = shift;
-  $dirStr =~ s/\/*\/\.\/\/*/\//g;	# remove dotslashes
-  $dirStr =~ s/^\.\/\/*//;		# remove heading dotslash
-  $dirStr =~ s/\/+$//;			# remove trailing slashes
-  return $dirStr;
-}
-
-########################################################################################
-# Usage      : dirValidator($dir_str)
-# Purpose    : validates given string as no tree and no current directory
-# Returns    : 0 or 1
-# Parameters : [string] $dir_str
-# Throws     : no exceptions
-# Comments   : none
-# See Also   : N/A
-sub dirValidator {
-  my $dirStr = shift;
-  if ($dirStr =~ m/\// or
-      $dirStr eq "." or
-      $dirStr eq ".." or
-      $dirStr eq "") {
-    return 0;
-  }
-  return 1;
-}
-
-########################################################################################
 #
 # switchColor() switches to user defined color scheme
 #
@@ -2238,9 +2203,6 @@ if (not grep (/^$cfgOpts{'aggregation mode'}$/, ('none', 'delta', 'template')))
   warnmsg ("Aggregation mode isn't correct!\n");
 }
 
-$cfgOpts{'aggregation directory'} = dirConv($cfgOpts{'aggregation directory'});
-$cfgOpts{'aggregation virtual directory'} = dirConv($cfgOpts{'aggregation virtual directory'});
-
 # Calculate ExifTool's verbosity
 my $exiftoolVerbose = ($verbose > $maxVerbosity) ? ($verbose - $maxVerbosity) : 0;