From patchwork Sat Jan 30 09:22:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1433599 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=YDOmpqnC; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DSTJp2HhWz9sWg for ; Sat, 30 Jan 2021 20:23:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 13A5D8232D; Sat, 30 Jan 2021 10:23:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="YDOmpqnC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7EF158240E; Sat, 30 Jan 2021 10:22:58 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 98BB4806C5 for ; Sat, 30 Jan 2021 10:22:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1611998568; bh=H0fG6/L1D0RVlMphYaY3Mpq6D7IFb25fieu3vyWZsgQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=YDOmpqnCcqCV7Gu6YcH4J53bAE8Rm3OQa6KCFhDplZ2NHlNekyhvqHLVr9cJma6dt Fe4JlHG2JEo++a0boL9xLkqoS0bJjyucOujN3nBeM20wsjajm+FOCLZnrgtRLRylnw Na4ujwqmPPA7e3WsIS3PfC8IMCa/emyVBgMUk0OQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([62.143.246.89]) by mail.gmx.net (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MqJm5-1ljm712IAF-00nSuU; Sat, 30 Jan 2021 10:22:48 +0100 From: Heinrich Schuchardt To: Tom Rini Cc: Simon Glass , Marek Szyprowski , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/1] fs: fat: usage basename in file_fat_write_at, fat_mkdir Date: Sat, 30 Jan 2021 10:22:42 +0100 Message-Id: <20210130092243.126632-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:IkQd6DNhlWZxhUuSKIOK9OqrmG1wIrMT152dPjpo8GNB7a0FD+A 3AlVJEHfJMNlY0aXKwVvWSHlzg+YTfPGp13nfZkhcXcn9GZnw3KSmRGO41HcSF0ROQzFOOu HKCetWRE/tYcnokQrpi4danDqR6mzriIyy13DgCelt9NGhI4SbGHQN4bNqcTmgREEsKr8Ah MVOUeHPgYYOK9niZwEo+A== X-UI-Out-Filterresults: notjunk:1;V03:K0:6FrpN0CnZSg=:sLoWxJwD7ocmm8ZFrkUc3r 8Y0PKSATWremenMdbw/BBtZMHZaPEVJKov58hMNDiVCj3QvUOhStGn3APs/JDWWV/o9w6kelU vIPwd5OwMmcQBoBgjt5iwOW1RWGEpTXMHvGzSaoHVVmzhA2xMjkanHbqHmMB09qu9LW4IYgFN mSJlU1wCWH+p3aXHPGikKwF9VI0xbSNwEOX83Va2Twggz24Np1mmvzpcBrqDxswMpIvhLjlnC LtfLNa0IQH5ZQVL6FyMfpxyblGVwkWm6+nStc8j+i5XcsJXwHlP0scZx2jQbzRU3QWkhFfDEE geX2Z9SuejDV/dZHiUFcIfFJwyNkLKBTtRMJotcQoL1EEN+sirqcNIU5/nWxNQ/5GmnRwfr2w z4XUOzMap1a6mrtO3NhW4cIJnYs7ucdErD6D4bQRkwMKsQkHPVj6id2aVs5bkEDdd9QAQX1v4 08J5rvnjDJK+BCY+nULydkt2lPWgGrfKJqZIs2rLEMcceWP/lT8aChapILeyxPjsTjFEwZvzt Qc1RPuXTZzkXSfydkPQMcyIojBPqU8DrbECLmNul5GoiDmq9iMB2kdSdlZVK6g+4ycFiiS5tk WaM3ZdNnfZwzHTv4OKmcmXw6jFtH7M30eihPR8kQAXYCVg8zewuGTSlDGIdqKikdFel0yWdw3 eVtMOUsZD73YAH87Mis9Flrz8/vKM9G3dkNdpn2ZD47GZRKuEc2vjr4/FmAYPReUvEv+uWJit U9Z29tUt2xWy1suDGAEYD2fk1Xc5kSoDAIC4/b3SiYSBnItofRxW6wDfNm3heCLLoaKslVouL rW61XIdZeLp5x3GN+FJ47iXuVS1Fm+j1xI7kUfOMaLHgBfKRGsFTUIdnuNpXzyHWvwVoa/z+z Fc1zAnoll2eAkDHg+AKg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean This patch involves no functional change. It is just about code readability. Both in file_fat_write_at() and fat_mkdir() the incoming file or directory path are split into two parts: the parent directory and the base name. In file_fat_write_at() the value of the variable basename is assigned to the filename parameter and afterwards the variable filename is used instead of basename. It is more readable to use the variable basename and leave filename unchanged. In fat_mkdir() the base name variable is called directory. This is confusing. Call it basename like in file_fat_write_at(). This allows to rename parameter new_directory to directory in the implementation of fat_mkdir() to match the function declaration. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- fs/fat/fat_write.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) -- 2.29.2 diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index b43a27b205..a9b9fa5d68 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -1299,9 +1299,8 @@ int file_fat_write_at(const char *filename, loff_t pos, void *buffer, goto exit; } - filename = basename; - if (normalize_longname(l_filename, filename)) { - printf("FAT: illegal filename (%s)\n", filename); + if (normalize_longname(l_filename, basename)) { + printf("FAT: illegal filename (%s)\n", basename); ret = -EINVAL; goto exit; } @@ -1365,7 +1364,7 @@ int file_fat_write_at(const char *filename, loff_t pos, void *buffer, } /* Check if long name is needed */ - ndent = set_name(itr, filename, shortname); + ndent = set_name(itr, basename, shortname); if (ndent < 0) { ret = ndent; goto exit; @@ -1375,7 +1374,7 @@ int file_fat_write_at(const char *filename, loff_t pos, void *buffer, goto exit; if (ndent > 1) { /* Set long name entries */ - ret = fill_dir_slot(itr, filename, shortname); + ret = fill_dir_slot(itr, basename, shortname); if (ret) goto exit; } @@ -1611,31 +1610,31 @@ exit: return ret; } -int fat_mkdir(const char *new_dirname) +int fat_mkdir(const char *dirname) { dir_entry *retdent; fsdata datablock = { .fatbuf = NULL, }; fsdata *mydata = &datablock; fat_itr *itr = NULL; - char *dirname_copy, *parent, *dirname; + char *dirname_copy, *parent, *basename; char l_dirname[VFAT_MAXLEN_BYTES]; int ret = -1; loff_t actwrite; unsigned int bytesperclust; dir_entry *dotdent = NULL; - dirname_copy = strdup(new_dirname); + dirname_copy = strdup(dirname); if (!dirname_copy) goto exit; - split_filename(dirname_copy, &parent, &dirname); - if (!strlen(dirname)) { + split_filename(dirname_copy, &parent, &basename); + if (!strlen(basename)) { ret = -EINVAL; goto exit; } - if (normalize_longname(l_dirname, dirname)) { - printf("FAT: illegal filename (%s)\n", dirname); + if (normalize_longname(l_dirname, basename)) { + printf("FAT: illegal filename (%s)\n", basename); ret = -EINVAL; goto exit; } @@ -1678,7 +1677,7 @@ int fat_mkdir(const char *new_dirname) } /* Check if long name is needed */ - ndent = set_name(itr, dirname, shortname); + ndent = set_name(itr, basename, shortname); if (ndent < 0) { ret = ndent; goto exit; @@ -1688,7 +1687,7 @@ int fat_mkdir(const char *new_dirname) goto exit; if (ndent > 1) { /* Set long name entries */ - ret = fill_dir_slot(itr, dirname, shortname); + ret = fill_dir_slot(itr, basename, shortname); if (ret) goto exit; }