code cleanup

[pve-common.git] / data / PVE / Tools.pm

diff --git a/data/PVE/Tools.pm b/data/PVE/Tools.pm
index 5b30aedbdbb40079e270236d2160c018c632f407..b222debf24ebdd2ee81808e0ecf5ed43a15e7edb 100644 (file)
--- a/data/PVE/Tools.pm
+++ b/data/PVE/Tools.pm
@@ -19,6 +19,9 @@ use Text::ParseWords;
 use String::ShellQuote;
 use Time::HiRes qw(usleep gettimeofday tv_interval);
 
+# avoid warning when parsing long hex values with hex()
+no warnings 'portable'; # Support for 64-bit ints required
+
 our @EXPORT_OK = qw(
 $IPV6RE
 $IPV4RE
@@ -142,8 +145,7 @@ sub lock_file_full {
        $err = $@;
     }
 
-    if ($lock_handles->{$$}->{$filename}) {
-        my $fh = $lock_handles->{$$}->{$filename};
+    if (my $fh = $lock_handles->{$$}->{$filename}) {
         $lock_handles->{$$}->{$filename} = undef;
         close ($fh);
     }
@@ -1015,8 +1017,30 @@ sub assert_if_modified {
     my ($digest1, $digest2) = @_;
 
     if ($digest1 && $digest2 && ($digest1 ne $digest2)) {
-       die "detected modified configuration - file change by other user? Try again.\n";
+       die "detected modified configuration - file changed by other user? Try again.\n";
     }
 }
 
+# Digest for short strings
+# like FNV32a, but we only return 31 bits (positive numbers)
+sub fnv31a {
+    my ($string) = @_;
+
+    my $hval = 0x811c9dc5;
+
+    foreach my $c (unpack('C*', $string)) {
+       $hval ^= $c;
+       $hval += (
+           (($hval << 1) ) +
+           (($hval << 4) ) +
+           (($hval << 7) ) +
+           (($hval << 8) ) +
+           (($hval << 24) ) );
+       $hval = $hval & 0xffffffff;
+    }
+    return $hval & 0x7fffffff;
+}
+
+sub fnv31a_hex { return sprintf("%X", fnv31a(@_)); }
+
 1;