Changeset 850fd32 in mainline for uspace/app

Timestamp:

2018-03-11T01:21:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

84239b1, f0e825d

Parents:

338d54a7

Message:

Fix mischievious semicolons.

Location:

uspace/app

Files:

• bdsh/util.c (modified) (1 diff)
• edit/edit.c (modified) (1 diff)
• sbi/src/run_expr.c (modified) (1 diff)
• sbi/src/run_texpr.c (modified) (1 diff)
• tester/float/float2.c (modified) (1 diff)
• usbinfo/main.c (modified) (3 diffs)
• wavplay/dplay.c (modified) (1 diff)
• wavplay/main.c (modified) (1 diff)

uspace/app/bdsh/util.c

@@ -45 +45 @@
         unsigned int i;
 
-        for (i=0; args[i] != NULL; i++);
+        i = 0;
+        while (args[i] != NULL)
+                i++;
+
         return i;
 }

uspace/app/edit/edit.c

@@ -655 +655 @@
 
                         /* Handle key press. */
-                        if (((kev->mods & KM_ALT) == 0) &&
-                             (kev->mods & KM_CTRL) != 0) {
-                                ;
-                        } else if ((kev->mods & (KM_CTRL | KM_ALT)) == 0) {
+                        if ((kev->mods & (KM_CTRL | KM_ALT)) == 0) {
                                 switch (kev->key) {
                                 case KC_ESCAPE:

uspace/app/sbi/src/run_expr.c

@@ -384 +384 @@
                          */
                         sobj = proc_ar->obj;
-                        aobj = sobj->u.object_v;;
+                        aobj = sobj->u.object_v;
                 }
 

uspace/app/sbi/src/run_texpr.c

@@ -99 +99 @@
         stree_symbol_t *sym;
         tdata_item_t *targ_i = NULL;
-        tdata_item_t *titem = NULL;;
+        tdata_item_t *titem = NULL;
         tdata_object_t *tobject;
         tdata_deleg_t *tdeleg;

uspace/app/tester/float/float2.c

@@ -449 +449 @@
                 }
         }
-;
+
         for (unsigned int i = 0; i < OPERANDS; i++) {
                 double res = sinh(arguments_exp[i]);

uspace/app/usbinfo/main.c

@@ -153 +153 @@
          */
         int opt;
+        int idx;
         do {
                 opt = getopt_long(argc, argv,
@@ -168 +169 @@
                                 print_usage(argv[0]);
                                 return 0;
-                        default: {
-                                int idx = 0;
+                        default:
+                                idx = 0;
                                 while (actions[idx].opt != 0) {
                                         if (actions[idx].opt == opt) {
@@ -179 +180 @@
                                 }
                                 break;
-                        }
                 }
         } while (opt > 0);

uspace/app/wavplay/dplay.c

@@ -176 +176 @@
         }
 
-        for (pb->playing = true; pb->playing;
-            fibril_condvar_wait(&pb->cv, &pb->mutex));
+        pb->playing = true;
+        while (pb->playing)
+                fibril_condvar_wait(&pb->cv, &pb->mutex);
 
         fibril_mutex_unlock(&pb->mutex);

uspace/app/wavplay/main.c

@@ -260 +260 @@
                         print_help(*argv);
                         return 0;
-                };
+                }
         }