xfs
[Top] [All Lists]

[PATCH v3, 12/16] xfsprogs: metadump: no need for local copy of name whe

To: xfs@xxxxxxxxxxx
Subject: [PATCH v3, 12/16] xfsprogs: metadump: no need for local copy of name when obfuscating
From: Alex Elder <aelder@xxxxxxx>
Date: Fri, 18 Feb 2011 15:21:02 -0600
User-agent: Heirloom mailx 12.5 7/5/10
The local "newname" buffer in obfuscate_name() is used to hold
an obfuscated name as it gets generated.  But it is always copied
back into the passed-in name buffer, so we might as well just use
the name buffer passed directly and avoid the copy.

Signed-off-by: Alex Elder <aelder@xxxxxxx>

This is a new change, not posted with this series previously.

---
 db/metadump.c |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

Index: b/db/metadump.c
===================================================================
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -479,8 +479,7 @@ obfuscate_name(
        size_t          name_len,
        uchar_t         *name)
 {
-       uchar_t         newname[NAME_MAX];
-       uchar_t         *newp = newname;
+       uchar_t         *newp = name;
        int             i;
        xfs_dahash_t    new_hash = 0;
        uchar_t         *first;
@@ -540,11 +539,7 @@ obfuscate_name(
                *first ^= 0x10;
                ASSERT(!is_invalid_char(*first));
        }
-       ASSERT(libxfs_da_hashname(newname, name_len) == hash);
-
-       /* Copy the fully obfuscated name back to the caller's buffer */
-
-       memcpy(name, newname, name_len);
+       ASSERT(libxfs_da_hashname(name, name_len) == hash);
 }
 
 static void

<Prev in Thread] Current Thread [Next in Thread>