Changeset 98000fb in mainline for kernel/generic/src/console

Timestamp:

2009-06-03T19:34:45Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

301ff30

Parents:

69e68e3

Message:

remove redundant index_t and count_t types (which were always quite ambiguous and not actually needed)

Location:

kernel/generic/src/console

Files:

• cmd.c (modified) (3 diffs)
• console.c (modified) (3 diffs)
• kconsole.c (modified) (10 diffs)

kernel/generic/src/console/cmd.c

@@ -514 +514 @@
         
         link_t *cur;
-        count_t len = 0;
+        size_t len = 0;
         for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
                 cmd_info_t *hlp;
@@ -652 +652 @@
          */
         
-        count_t i;
+        size_t i;
         for (i = 0; i < config.cpu_count; i++) {
                 if (!cpus[i].active)
@@ -971 +971 @@
 int cmd_tests(cmd_arg_t *argv)
 {
-        count_t len = 0;
+        size_t len = 0;
         test_t *test;
         for (test = tests; test->name != NULL; test++) {

kernel/generic/src/console/console.c

@@ -62 +62 @@
 static bool klog_inited = false;
 /** First kernel log characters */
-static index_t klog_start = 0;
+static size_t klog_start = 0;
 /** Number of valid kernel log characters */
 static size_t klog_len = 0;
@@ -171 +171 @@
  *
  */
-count_t gets(indev_t *indev, char *buf, size_t buflen)
+size_t gets(indev_t *indev, char *buf, size_t buflen)
 {
         size_t offset = 0;
-        count_t count = 0;
+        size_t count = 0;
         buf[offset] = 0;
         
@@ -227 +227 @@
         if ((klog_stored > 0) && (stdout) && (stdout->op->write)) {
                 /* Print charaters stored in kernel log */
-                index_t i;
+                size_t i;
                 for (i = klog_len - klog_stored; i < klog_len; i++)
                         stdout->op->write(stdout, klog[(klog_start + i) % KLOG_LENGTH], silent);

kernel/generic/src/console/kconsole.c

@@ -87 +87 @@
 
 static wchar_t history[KCONSOLE_HISTORY][MAX_CMDLINE] = {};
-static count_t history_pos = 0;
+static size_t history_pos = 0;
 
 /** Initialize kconsole data structures
@@ -160 +160 @@
 
 /** Print count times a character */
-static void print_cc(wchar_t ch, count_t count)
-{
-        count_t i;
+static void print_cc(wchar_t ch, size_t count)
+{
+        size_t i;
         for (i = 0; i < count; i++)
                 putchar(ch);
@@ -170 +170 @@
 static const char *cmdtab_search_one(const char *name, link_t **startpos)
 {
-        count_t namelen = str_length(name);
+        size_t namelen = str_length(name);
         
         spinlock_lock(&cmd_lock);
@@ -206 +206 @@
         const char *name = input;
         
-        count_t found = 0;
+        size_t found = 0;
         link_t *pos = NULL;
         const char *hint;
@@ -241 +241 @@
         printf("%s> ", prompt);
         
-        count_t position = 0;
+        size_t position = 0;
         wchar_t *current = history[history_pos];
         current[0] = 0;
@@ -281 +281 @@
                         /* Find the beginning of the word
                            and copy it to tmp */
-                        count_t beg;
+                        size_t beg;
                         for (beg = position - 1; (beg > 0) && (!isspace(current[beg]));
                             beg--);
@@ -314 +314 @@
                         
                         size_t off = 0;
-                        count_t i = 0;
+                        size_t i = 0;
                         while ((ch = str_decode(tmp, &off, STR_NO_LIMIT)) != 0) {
                                 if (!wstr_linsert(current, ch, position + i, MAX_CMDLINE))
@@ -543 +543 @@
                 if (str_lcmp(hlp->name, cmdline + start,
                     max(str_length(hlp->name),
-                    str_nlength(cmdline + start, (count_t) (end - start) - 1))) == 0) {
+                    str_nlength(cmdline + start, (size_t) (end - start) - 1))) == 0) {
                         cmd = hlp;
                         break;
@@ -569 +569 @@
         
         bool error = false;
-        count_t i;
+        size_t i;
         for (i = 0; i < cmd->argc; i++) {
                 start = end;
@@ -660 +660 @@
         while (true) {
                 wchar_t *tmp = clever_readline((char *) prompt, stdin);
-                count_t len = wstr_length(tmp);
+                size_t len = wstr_length(tmp);
                 if (!len)
                         continue;