xfsprogs: metadump: replace repeated blocks with a loop

Each of the last five characters in the obfuscated name are
generated the same way.  Replace that repeated block of code
with an equivalent loop.

Signed-off-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

diff --git a/db/metadump.c b/db/metadump.c
index b8d259b2c1eacba8ccfd3f8777e788b265ffc3b7..5d04201fd084a1a80720663eec93913d39d05a11 100644 (file)
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -511,41 +511,16 @@ generate_obfuscated_name(
                newhash = rol32(newhash, 3) ^ hash;
 
                high_bit = 0;
-
-               newp[namelen - 5] = ((newhash >> 28) & 0x7f) ^ high_bit;
-               if (is_invalid_char(newp[namelen - 5])) {
-                       newp[namelen - 5] ^= 1;
-                       high_bit = 0x80;
-               } else
-                       high_bit = 0;
-
-               newp[namelen - 4] = ((newhash >> 21) & 0x7f) ^ high_bit;
-               if (is_invalid_char(newp[namelen - 4])) {
-                       newp[namelen - 4] ^= 1;
-                       high_bit = 0x80;
-               } else
-                       high_bit = 0;
-
-               newp[namelen - 3] = ((newhash >> 14) & 0x7f) ^ high_bit;
-               if (is_invalid_char(newp[namelen - 3])) {
-                       newp[namelen - 3] ^= 1;
-                       high_bit = 0x80;
-               } else
-                       high_bit = 0;
-
-               newp[namelen - 2] = ((newhash >> 7) & 0x7f) ^ high_bit;
-               if (is_invalid_char(newp[namelen - 2])) {
-                       newp[namelen - 2] ^= 1;
-                       high_bit = 0x80;
-               } else
-                       high_bit = 0;
-
-               newp[namelen - 1] = ((newhash >> 0) & 0x7f) ^ high_bit;
-               if (is_invalid_char(newp[namelen - 1])) {
-                       newp[namelen - 1] ^= 1;
-                       high_bit = 0x80;
-               } else
-                       high_bit = 0;
+               for (i = 5; i > 0; i--) {
+                       int shift = (i - 1) * 7;
+
+                       newp[namelen - i] = ((newhash >> shift) & 0x7f) ^ high_bit;
+                       if (is_invalid_char(newp[namelen - i])) {
+                               newp[namelen - i] ^= 1;
+                               high_bit = 0x80;
+                       } else
+                               high_bit = 0;
+               }
 
                /*
                 * If we flipped a bit on the last byte, we need to