Changeset e435537 in mainline for uspace

Timestamp:

2012-07-17T15:14:01Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a00d555

Parents:

9904eb90 (diff), dfc07c1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

cstyle

Location:

uspace

Files:

• app/bdsh/cmds/modules/cat/cat.c (modified) (4 diffs)
• srv/hid/console/console.c (modified) (3 diffs)

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -176 +176 @@
 
         bool reading_stdin = dash_represents_stdin && (str_cmp(fname, "-") == 0);
-
+        
         if (reading_stdin) {
                 fd = fileno(stdin);
                 /* Allow storing the whole UTF-8 character. */
                 blen = STR_BOUNDS(1);
-        } else {
+        } else
                 fd = open(fname, O_RDONLY);
-        }
+        
         if (fd < 0) {
                 printf("Unable to open %s\n", fname);
@@ -222 +222 @@
                         bytes_to_read = 1;
                 } else {
-                        if ((length != CAT_FULL_FILE)
-                            && (length - (off64_t)count <= (off64_t)(blen - copied_bytes))) {
+                        if ((length != CAT_FULL_FILE) &&
+                            (length - (off64_t)count <= (off64_t)(blen - copied_bytes))) {
                                 bytes_to_read = (size_t) (length - count);
                         } else {
@@ -229 +229 @@
                         }
                 }
+                
                 bytes = read(fd, buff + copied_bytes, bytes_to_read);
                 bytes += copied_bytes;
@@ -261 +262 @@
                         reads++;
                 }
-
-                if (reading_stdin) {
+                
+                if (reading_stdin)
                         fflush(stdout);
-                }
         } while (bytes > 0 && !should_quit && (count < length || length == CAT_FULL_FILE));
 

uspace/srv/hid/console/console.c

@@ -617 +617 @@
         
         size_t pos = 0;
-
+        
         /*
          * Read input from keyboard and copy it to the buffer.
@@ -628 +628 @@
                         buf[pos] = cons->char_remains[0];
                         pos++;
+                        
                         /* Unshift the array. */
-                        for (size_t i = 1; i < cons->char_remains_len; i++) {
+                        for (size_t i = 1; i < cons->char_remains_len; i++)
                                 cons->char_remains[i - 1] = cons->char_remains[i];
-                        }
+                        
                         cons->char_remains_len--;
                 }
+                
                 /* Still not enough? Then get another key from the queue. */
                 if (pos < size) {
                         link_t *link = prodcons_consume(&cons->input_pc);
                         kbd_event_t *event = list_get_instance(link, kbd_event_t, link);
-
+                        
                         /* Accept key presses of printable chars only. */
                         if ((event->type == KEY_PRESS) && (event->c != 0)) {
@@ -645 +647 @@
                                 cons->char_remains_len = str_size(cons->char_remains);
                         }
-
+                        
                         free(event);
                 }