Changeset 5d67baa in mainline for kernel/generic/src

Timestamp:

2008-06-30T20:33:18Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

939e9c1

Parents:

ac0e791

Message:

cstyle fixes

Location:

kernel/generic/src

Files:

• console/kconsole.c (modified) (7 diffs)
• main/main.c (modified) (4 diffs)

kernel/generic/src/console/kconsole.c

@@ -170 +170 @@
 
 /** Try to find a command beginning with prefix */
-static const char * cmdtab_search_one(const char *name,link_t **startpos)
+static const char *cmdtab_search_one(const char *name,link_t **startpos)
 {
         size_t namelen = strlen(name);
@@ -204 +204 @@
 static int cmdtab_compl(char *name)
 {
-        static char output[MAX_SYMBOL_NAME+1];
+        static char output[MAX_SYMBOL_NAME + 1];
         link_t *startpos = NULL;
         const char *foundtxt;
@@ -214 +214 @@
                 startpos = startpos->next;
                 if (!found)
-                        strncpy(output, foundtxt, strlen(foundtxt)+1);
+                        strncpy(output, foundtxt, strlen(foundtxt) + 1);
                 else {
                         for (i = 0; output[i] && foundtxt[i] &&
@@ -241 +241 @@
 }
 
-static char * clever_readline(const char *prompt, chardev_t *input)
+//char *clever_readline(const char *prompt, chardev_t *input);
+static char *clever_readline(const char *prompt, chardev_t *input)
 {
         static int histposition = 0;
 
-        static char tmp[MAX_CMDLINE+1];
+        static char tmp[MAX_CMDLINE + 1];
         int curlen = 0, position = 0;
         char *current = history[histposition];
@@ -258 +259 @@
                         putchar(c);
                         break;
-                } if (c == '\b') { /* Backspace */
+                }
+                if (c == '\b') { /* Backspace */
                         if (position == 0)
                                 continue;
@@ -544 +546 @@
                         strncpy(buf, (const char *) &cmdline[start],
                             min((end - start) + 2, cmd->argv[i].len));
-                        buf[min((end - start) + 1, cmd->argv[i].len - 1)] = '\0';
+                        buf[min((end - start) + 1, cmd->argv[i].len - 1)] =
+                            '\0';
                         break;
                 case ARG_TYPE_INT: 
@@ -561 +564 @@
                                 cmd->argv[i].intval = (unative_t) buf;
                                 cmd->argv[i].vartype = ARG_TYPE_STRING;
-                        } else if (!parse_int_arg(cmdline + start, end - start + 1, 
-                            &cmd->argv[i].intval)) {
+                        } else if (!parse_int_arg(cmdline + start,
+                            end - start + 1, &cmd->argv[i].intval)) {
                                 cmd->argv[i].vartype = ARG_TYPE_INT;
                         } else {

kernel/generic/src/main/main.c

@@ -62 +62 @@
 #include <main/version.h>
 #include <console/kconsole.h>
+#include <console/console.h>
 #include <cpu.h>
 #include <align.h>
@@ -81 +82 @@
 #include <smp/smp.h>
 #include <ddi/ddi.h>
-#include <console/console.h>
+
 
 /** Global configuration structure. */
@@ -236 +237 @@
         LOG_EXEC(slab_enable_cpucache());
         
-        printf("Detected %" PRIc " CPU(s), %" PRIu64" MB free memory\n",
-                config.cpu_count, SIZE2MB(zone_total_size()));
+        printf("Detected %" PRIc " CPU(s), %" PRIu64" MiB free memory\n",
+            config.cpu_count, SIZE2MB(zone_total_size()));
         
         LOG_EXEC(cpu_init());
@@ -253 +254 @@
                 for (i = 0; i < init.cnt; i++)
                         printf("init[%" PRIc "].addr=%#" PRIp ", init[%" PRIc
-                            "].size=%#" PRIs "\n", i, init.tasks[i].addr,
-                            i, init.tasks[i].size);
+                            "].size=%#" PRIs "\n", i, init.tasks[i].addr, i,
+                            init.tasks[i].size);
         } else
                 printf("No init binaries found\n");