include/bitfield.h: Assure new bitfield value doesn't touch unwanted bits

[karo-tx-uboot.git] / common / cmd_ubifs.c

diff --git a/common/cmd_ubifs.c b/common/cmd_ubifs.c
index 3cd2d8fa824a074a0b42684cd183818f6000a48f..8e9a4e5038d87c19cfda9850dab0dbfa3d7446b0 100644 (file)
--- a/common/cmd_ubifs.c
+++ b/common/cmd_ubifs.c
@@ -2,24 +2,7 @@
  * (C) Copyright 2008
  * Stefan Roese, DENX Software Engineering, sr@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 
@@ -38,22 +21,14 @@
 static int ubifs_initialized;
 static int ubifs_mounted;
 
-extern struct super_block *ubifs_sb;
-
-/* Prototypes */
-int ubifs_init(void);
-int ubifs_mount(char *vol_name);
-void ubifs_umount(struct ubifs_info *c);
-int ubifs_ls(char *dir_name);
-int ubifs_load(char *filename, u32 addr, u32 size);
-
-int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc,
+                               char * const argv[])
 {
        char *vol_name;
        int ret;
 
        if (argc != 2)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        vol_name = argv[1];
        debug("Using volume %s\n", vol_name);
@@ -63,7 +38,7 @@ int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                ubifs_initialized = 1;
        }
 
-       ret = ubifs_mount(vol_name);
+       ret = uboot_ubifs_mount(vol_name);
        if (ret)
                return -1;
 
@@ -91,10 +66,11 @@ void cmd_ubifs_umount(void)
        ubifs_initialized = 0;
 }
 
-int do_ubifs_umount(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_ubifs_umount(cmd_tbl_t *cmdtp, int flag, int argc,
+                               char * const argv[])
 {
        if (argc != 1)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        if (ubifs_initialized == 0) {
                printf("No UBIFS volume mounted!\n");
@@ -106,7 +82,8 @@ int do_ubifs_umount(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        return 0;
 }
 
-int do_ubifs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_ubifs_ls(cmd_tbl_t *cmdtp, int flag, int argc,
+                       char * const argv[])
 {
        char *filename = "/";
        int ret;
@@ -121,13 +98,16 @@ int do_ubifs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        debug("Using filename %s\n", filename);
 
        ret = ubifs_ls(filename);
-       if (ret)
-               printf("%s not found!\n", filename);
+       if (ret) {
+               printf("** File not found %s **\n", filename);
+               ret = CMD_RET_FAILURE;
+       }
 
        return ret;
 }
 
-int do_ubifs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_ubifs_load(cmd_tbl_t *cmdtp, int flag, int argc,
+                               char * const argv[])
 {
        char *filename;
        char *endp;
@@ -141,24 +121,26 @@ int do_ubifs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        }
 
        if (argc < 3)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        addr = simple_strtoul(argv[1], &endp, 16);
        if (endp == argv[1])
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        filename = argv[2];
 
        if (argc == 4) {
                size = simple_strtoul(argv[3], &endp, 16);
                if (endp == argv[3])
-                       return cmd_usage(cmdtp);
+                       return CMD_RET_USAGE;
        }
        debug("Loading file '%s' to address 0x%08x (size %d)\n", filename, addr, size);
 
        ret = ubifs_load(filename, addr, size);
-       if (ret)
-               printf("%s not found!\n", filename);
+       if (ret) {
+               printf("** File not found %s **\n", filename);
+               ret = CMD_RET_FAILURE;
+       }
 
        return ret;
 }