flash_lock/flash_unlock/flash_info: clean up style

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --git a/flash_info.c b/flash_info.c
index ad7b30a9ef9d003c66551e27f0c85d2c0bdb0cff..f8b7efaba326a21f3b5d094351afab2949cd32d1 100644 (file)
--- a/flash_info.c
+++ b/flash_info.c
@@ -14,44 +14,39 @@
 
 #include <mtd/mtd-user.h>
 
-int main(int argc,char *argv[])
+int main(int argc, char *argv[])
 {
        int regcount;
-       int Fd;
+       int fd;
 
-       if (1 >= argc)
-       {
-               fprintf(stderr,"Usage: %s device\n", PROGRAM_NAME);
+       if (1 >= argc) {
+               fprintf(stderr, "Usage: %s device\n", PROGRAM_NAME);
                return 16;
        }
 
-       // Open and size the device
-       if ((Fd = open(argv[1],O_RDONLY)) < 0)
-       {
-               fprintf(stderr,"File open error\n");
+       /* Open and size the device */
+       fd = open(argv[1], O_RDONLY);
+       if (fd < 0) {
+               fprintf(stderr, "File open error\n");
                return 8;
        }
 
-       if (ioctl(Fd,MEMGETREGIONCOUNT,&regcount) == 0)
-       {
+       if (ioctl(fd, MEMGETREGIONCOUNT, &regcount) == 0) {
                int i;
                region_info_t reginfo;
                printf("Device %s has %d erase regions\n", argv[1], regcount);
-               for (i = 0; i < regcount; i++)
-               {
+               for (i = 0; i < regcount; i++) {
                        reginfo.regionindex = i;
-                       if(ioctl(Fd, MEMGETREGIONINFO, &reginfo) == 0)
-                       {
+                       if (ioctl(fd, MEMGETREGIONINFO, &reginfo) == 0) {
                                printf("Region %d is at 0x%x with size 0x%x and "
                                                "has 0x%x blocks\n", i, reginfo.offset,
                                                reginfo.erasesize, reginfo.numblocks);
-                       }
-                       else
-                       {
+                       } else {
                                printf("Strange can not read region %d from a %d region device\n",
                                                i, regcount);
                        }
                }
        }
+
        return 0;
 }

diff --git a/flash_lock.c b/flash_lock.c
index ef7523464c45a7462f83cd2642e956f6072e20de..8cd1b82f5fb58fba167528bfca880cfcfda7a10d 100644 (file)
--- a/flash_lock.c
+++ b/flash_lock.c
@@ -29,53 +29,46 @@ int main(int argc, char *argv[])
        /*
         * Parse command line options
         */
-       if(argc != 4)
-       {
+       if (argc != 4) {
                fprintf(stderr, "USAGE: %s <mtd device> <ofs in hex> <num of sectors in decimal or -1 for all sectors>\n", PROGRAM_NAME);
                exit(1);
-       }
-       else if(strncmp(argv[1], "/dev/mtd", 8) != 0)
-       {
+       } else if (strncmp(argv[1], "/dev/mtd", 8) != 0) {
                fprintf(stderr, "'%s' is not a MTD device.  Must specify mtd device: /dev/mtd?\n", argv[1]);
                exit(1);
        }
 
        fd = open(argv[1], O_RDWR);
-       if(fd < 0)
-       {
+       if (fd < 0) {
                fprintf(stderr, "Could not open mtd device: %s\n", argv[1]);
                exit(1);
        }
 
-       if(ioctl(fd, MEMGETINFO, &mtdInfo))
-       {
+       if (ioctl(fd, MEMGETINFO, &mtdInfo)) {
                fprintf(stderr, "Could not get MTD device info from %s\n", argv[1]);
                close(fd);
                exit(1);
        }
-       sscanf(argv[2], "%x",&ofs);
-       sscanf(argv[3], "%d",&num_sectors);
-       if(ofs > mtdInfo.size - mtdInfo.erasesize)
-       {
-               fprintf(stderr, "%x is beyond device size %x\n",ofs,(unsigned int)(mtdInfo.size - mtdInfo.erasesize));
+       sscanf(argv[2], "%x", &ofs);
+       sscanf(argv[3], "%d", &num_sectors);
+       if (ofs > mtdInfo.size - mtdInfo.erasesize) {
+               fprintf(stderr, "%x is beyond device size %x\n", ofs,
+                       (unsigned int)(mtdInfo.size - mtdInfo.erasesize));
                exit(1);
        }
 
        if (num_sectors == -1) {
-               num_sectors = mtdInfo.size/mtdInfo.erasesize;
-       }
-       else {
-               if(num_sectors > mtdInfo.size/mtdInfo.erasesize)
-               {
-                       fprintf(stderr, "%d are too many sectors, device only has %d\n",num_sectors,(int)(mtdInfo.size/mtdInfo.erasesize));
+               num_sectors = mtdInfo.size / mtdInfo.erasesize;
+       } else {
+               if (num_sectors > mtdInfo.size / mtdInfo.erasesize) {
+                       fprintf(stderr, "%d are too many sectors, device only has %d\n",
+                               num_sectors, (int)(mtdInfo.size / mtdInfo.erasesize));
                        exit(1);
                }
        }
 
        mtdLockInfo.start = ofs;
        mtdLockInfo.length = (num_sectors - 1) * mtdInfo.erasesize;
-       if(ioctl(fd, MEMLOCK, &mtdLockInfo))
-       {
+       if (ioctl(fd, MEMLOCK, &mtdLockInfo)) {
                fprintf(stderr, "Could not lock MTD device: %s\n", argv[1]);
                close(fd);
                exit(1);

diff --git a/flash_unlock.c b/flash_unlock.c
index 3d29a92fe701b8007a504db656248755a5d6abd3..26721a5a35c50e23cb2c5bd4409f1163b9b30271 100644 (file)
--- a/flash_unlock.c
+++ b/flash_unlock.c
@@ -28,26 +28,21 @@ int main(int argc, char *argv[])
        /*
         * Parse command line options
         */
-       if(argc < 2)
-       {
+       if (argc < 2) {
                fprintf(stderr, "USAGE: %s <mtd device> <offset in hex> <block count in decimal number>\n", PROGRAM_NAME);
                exit(1);
-       }
-       else if(strncmp(argv[1], "/dev/mtd", 8) != 0)
-       {
+       } else if (strncmp(argv[1], "/dev/mtd", 8) != 0) {
                fprintf(stderr, "'%s' is not a MTD device.  Must specify mtd device: /dev/mtd?\n", argv[1]);
                exit(1);
        }
 
        fd = open(argv[1], O_RDWR);
-       if(fd < 0)
-       {
+       if (fd < 0) {
                fprintf(stderr, "Could not open mtd device: %s\n", argv[1]);
                exit(1);
        }
 
-       if(ioctl(fd, MEMGETINFO, &mtdInfo))
-       {
+       if (ioctl(fd, MEMGETINFO, &mtdInfo)) {
                fprintf(stderr, "Could not get MTD device info from %s\n", argv[1]);
                close(fd);
                exit(1);
@@ -65,8 +60,7 @@ int main(int argc, char *argv[])
                mtdLockInfo.length = mtdInfo.size - mtdInfo.erasesize;
        }
 
-       if(ioctl(fd, MEMUNLOCK, &mtdLockInfo))
-       {
+       if (ioctl(fd, MEMUNLOCK, &mtdLockInfo)) {
                fprintf(stderr, "Could not unlock MTD device: %s\n", argv[1]);
                close(fd);
                exit(1);