Dockerfile, CI: Update to latest "focal" tag

[J-u-boot.git] / cmd / unzip.c

diff --git a/cmd/unzip.c b/cmd/unzip.c
index 0686be68ce0a857ead08ff840a23c444284f30fb..3d1f5f3ac1066e06dde8f54ca04e6c47125f206f 100644 (file)
--- a/cmd/unzip.c
+++ b/cmd/unzip.c
@@ -1,25 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, [email protected].
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <command.h>
+#include <env.h>
+#include <gzip.h>
+#include <part.h>
 
-static int do_unzip(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_unzip(struct cmd_tbl *cmdtp, int flag, int argc,
+                   char *const argv[])
 {
        unsigned long src, dst;
        unsigned long src_len = ~0UL, dst_len = ~0UL;
 
        switch (argc) {
                case 4:
-                       dst_len = simple_strtoul(argv[3], NULL, 16);
+                       dst_len = hextoul(argv[3], NULL);
                        /* fall through */
                case 3:
-                       src = simple_strtoul(argv[1], NULL, 16);
-                       dst = simple_strtoul(argv[2], NULL, 16);
+                       src = hextoul(argv[1], NULL);
+                       dst = hextoul(argv[2], NULL);
                        break;
                default:
                        return CMD_RET_USAGE;
@@ -28,8 +31,8 @@ static int do_unzip(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        if (gunzip((void *) dst, dst_len, (void *) src, &src_len) != 0)
                return 1;
 
-       printf("Uncompressed size: %ld = 0x%lX\n", src_len, src_len);
-       setenv_hex("filesize", src_len);
+       printf("Uncompressed size: %lu = 0x%lX\n", src_len, src_len);
+       env_set_hex("filesize", src_len);
 
        return 0;
 }
@@ -40,10 +43,10 @@ U_BOOT_CMD(
        "srcaddr dstaddr [dstsize]"
 );
 
-static int do_gzwrite(cmd_tbl_t *cmdtp, int flag,
-                     int argc, char * const argv[])
+static int do_gzwrite(struct cmd_tbl *cmdtp, int flag,
+                     int argc, char *const argv[])
 {
-       block_dev_desc_t *bdev;
+       struct blk_desc *bdev;
        int ret;
        unsigned char *addr;
        unsigned long length;
@@ -53,15 +56,15 @@ static int do_gzwrite(cmd_tbl_t *cmdtp, int flag,
 
        if (argc < 5)
                return CMD_RET_USAGE;
-       ret = get_device(argv[1], argv[2], &bdev);
+       ret = blk_get_device_by_str(argv[1], argv[2], &bdev);
        if (ret < 0)
                return CMD_RET_FAILURE;
 
-       addr = (unsigned char *)simple_strtoul(argv[3], NULL, 16);
-       length = simple_strtoul(argv[4], NULL, 16);
+       addr = (unsigned char *)hextoul(argv[3], NULL);
+       length = hextoul(argv[4], NULL);
 
        if (5 < argc) {
-               writebuf = simple_strtoul(argv[5], NULL, 16);
+               writebuf = hextoul(argv[5], NULL);
                if (6 < argc) {
                        startoffs = simple_strtoull(argv[6], NULL, 16);
                        if (7 < argc)