Changeset 84239b1 in mainline for uspace/app

Timestamp:

2018-03-11T19:39:11Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f3d47c97

Parents:

850fd32

Message:

And there was much fixing.

Location:

uspace/app

Files:

• mkexfat/mkexfat.c (modified) (10 diffs)
• mkfat/fat.h (modified) (1 diff)
• mkmfs/mkmfs.c (modified) (2 diffs)
• tester/chardev/chardev1.c (modified) (1 diff)
• tetris/tetris.c (modified) (1 diff)
• tmon/tests.c (modified) (1 diff)

uspace/app/mkexfat/mkexfat.c

@@ -680 +680 @@
         unsigned r;
 
-        for (r = 0;n >> r != 1; ++r);
+        r = 0;
+        while (n >> r != 1)
+                ++r;
 
         return r;
@@ -771 +773 @@
         cfg.label = NULL;
 
-        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+        c = 0;
+        optind = 0;
+        opt_ind = 0;
+        while (c != -1) {
                 c = getopt_long(argc, argv, "hs:c:L:",
                     long_options, &opt_ind);
@@ -845 +850 @@
 
         if (cfg.sector_size > 4096) {
-                printf(NAME ": Error, sector size can't be greater" \
+                printf(NAME ": Error, sector size can't be greater"
                     " than 4096 bytes.\n");
                 return 2;
@@ -852 +857 @@
         rc = block_get_nblocks(service_id, &cfg.volume_count);
         if (rc != EOK) {
-                printf(NAME ": Warning, failed to obtain" \
+                printf(NAME ": Warning, failed to obtain"
                     " block device size.\n");
 
                 if (user_fs_size == 0) {
-                        printf(NAME ": You must specify the" \
+                        printf(NAME ": You must specify the"
                             " filesystem size.\n");
                         return 1;
@@ -897 +902 @@
             div_round_up(cfg.bitmap_size, cfg.cluster_size));
         if (rc != EOK) {
-                printf(NAME ": Error, failed to allocate" \
+                printf(NAME ": Error, failed to allocate"
                     " clusters for bitmap.\n");
                 return 2;
@@ -910 +915 @@
             div_round_up(sizeof(upcase_table), cfg.cluster_size));
         if (rc != EOK) {
-                printf(NAME ":Error, failed to allocate clusters" \
+                printf(NAME ":Error, failed to allocate clusters"
                     " for the upcase table.\n");
                 return 2;
@@ -921 +926 @@
         rc = fat_allocate_clusters(service_id, &cfg, next_cls, 1);
         if (rc != EOK) {
-                printf(NAME ": Error, failed to allocate cluster" \
+                printf(NAME ": Error, failed to allocate cluster"
                     " for the root dentry.\n");
                 return 2;
@@ -931 +936 @@
         rc = bitmap_write(service_id, &cfg);
         if (rc != EOK) {
-                printf(NAME ": Error, failed to write the allocation" \
+                printf(NAME ": Error, failed to write the allocation"
                     " bitmap to disk.\n");
                 return 2;
@@ -941 +946 @@
         rc = upcase_table_write(service_id, &cfg);
         if (rc != EOK) {
-                printf(NAME ": Error, failed to write the" \
+                printf(NAME ": Error, failed to write the"
                     " upcase table to disk.\n");
                 return 2;
@@ -950 +955 @@
         rc = root_dentries_write(service_id, &cfg);
         if (rc != EOK) {
-                printf(NAME ": Error, failed to write the root directory" \
+                printf(NAME ": Error, failed to write the root directory"
                     " entries to disk.\n");
                 return 2;

uspace/app/mkfat/fat.h

@@ -117 +117 @@
                         /** Signature. */
                         uint16_t        signature;
-                } fat32 __attribute__ ((packed));
+                } __attribute__ ((packed)) fat32;
         };
 } __attribute__ ((packed)) fat_bs_t;

uspace/app/mkmfs/mkmfs.c

@@ -133 +133 @@
         }
 
-        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+        c = 0;
+        optind = 0;
+        opt_ind = 0;
+        while (c != -1) {
                 c = getopt_long(argc, argv, "lh12b:i:",
                     long_options, &opt_ind);
@@ -566 +569 @@
         errno_t rc;
 
-        sb = malloc(MFS_SUPERBLOCK_SIZE);;
+        sb = malloc(MFS_SUPERBLOCK_SIZE);
 
         if (!sb)

uspace/app/tester/chardev/chardev1.c

@@ -210 +210 @@
                 return s;
 
-        return test_chardev1_partialx();;
-}
+        return test_chardev1_partialx();
+}

uspace/app/tetris/tetris.c

@@ -116 +116 @@
                 base = i * B_COLS + 1;
                 p = &board[base];
-                for (j = B_COLS - 2; *p++ != 0;) {
+                j = B_COLS - 2;
+                while (*p++ != 0) {
                         if (--j <= 0) {
                                 /* This row is to be elided */

uspace/app/tmon/tests.c

@@ -81 +81 @@
         int c;
         uint32_t duration_uint;
-        for (c = 0, optreset = 1, optind = 0; c != -1;) {
+        c = 0;
+        optreset = 1;
+        optind = 0;
+        while (c != -1) {
                 c = getopt_long(argc, argv, short_options, long_options, NULL);
                 switch (c) {