From: Alex Elder Date: Fri, 18 Feb 2011 21:21:02 +0000 (+0000) Subject: xfsprogs: metadump: no need for local copy of name when obfuscating X-Git-Tag: v3.1.5~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=002c6e02955452b4c288ccfd478f92534dc62bb7;p=thirdparty%2Fxfsprogs-dev.git xfsprogs: metadump: no need for local copy of name when obfuscating 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 Reviewed-by: Dave Chinner --- diff --git a/db/metadump.c b/db/metadump.c index 5665abdcc..fdbd835b2 100644 --- a/db/metadump.c +++ b/db/metadump.c @@ -486,8 +486,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; @@ -550,11 +549,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