Changeset 06b785f in mainline for kernel/generic/src/console/kconsole.c

Timestamp:

2009-04-01T19:11:07Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

d09f84e6

Parents:

1b0b48e0

Message:

strlen() → str_size().

File:

• kernel/generic/src/console/kconsole.c (modified) (11 diffs)

kernel/generic/src/console/kconsole.c

@@ -138 +138 @@
                         spinlock_lock(&hlp->lock);
                 }
-                if ((strncmp(hlp->name, cmd->name, max(strlen(cmd->name),
-                    strlen(hlp->name))) == 0)) {
+                if ((strncmp(hlp->name, cmd->name, max(str_size(cmd->name),
+                    str_size(hlp->name))) == 0)) {
                         /* The command is already there. */
                         spinlock_unlock(&hlp->lock);
@@ -173 +173 @@
         int i;
         
-        for (i = strlen(str); i > pos; i--)
+        for (i = str_size(str); i > pos; i--)
                 str[i] = str[i - 1];
         str[pos] = ch;
@@ -181 +181 @@
 static const char *cmdtab_search_one(const char *name,link_t **startpos)
 {
-        size_t namelen = strlen(name);
+        size_t namelen = str_size(name);
         const char *curname;
 
@@ -194 +194 @@
 
                 curname = hlp->name;
-                if (strlen(curname) < namelen)
+                if (str_size(curname) < namelen)
                         continue;
                 if (strncmp(curname, name, namelen) == 0) {
@@ -223 +223 @@
                 startpos = startpos->next;
                 if (!found)
-                        strncpy(output, foundtxt, strlen(foundtxt) + 1);
+                        strncpy(output, foundtxt, str_size(foundtxt) + 1);
                 else {
                         for (i = 0; output[i] && foundtxt[i] &&
@@ -235 +235 @@
                 return 0;
 
-        if (found > 1 && !strlen(output)) {
+        if (found > 1 && !str_size(output)) {
                 printf("\n");
                 startpos = NULL;
@@ -310 +310 @@
                                 insert_char(current, tmp[i], i + position);
 
-                        if (strlen(tmp) || found == 1) { /* If we have a hint */
+                        if (str_size(tmp) || found == 1) { /* If we have a hint */
                                 for (i = position; i < curlen; i++) 
                                         putchar(current[i]);
-                                position += strlen(tmp);
+                                position += str_size(tmp);
                                 /* Add space to end */
                                 if (found == 1 && position == curlen &&
@@ -326 +326 @@
                                 for (i = 0; i < curlen; i++)
                                         putchar(current[i]);
-                                position += strlen(tmp);
+                                position += str_size(tmp);
                         }
                         rdln_print_c('\b', curlen - position);
@@ -385 +385 @@
                                 current = history[histposition];
                                 printf("%s", current);
-                                curlen = strlen(current);
+                                curlen = str_size(current);
                                 position = curlen;
                                 continue;
@@ -444 +444 @@
         while (true) {
                 cmdline = clever_readline((char *) prompt, stdin);
-                len = strlen(cmdline);
+                len = str_size(cmdline);
                 if (!len)
                         continue;
@@ -545 +545 @@
                 spinlock_lock(&hlp->lock);
                 
-                if (strncmp(hlp->name, &cmdline[start], max(strlen(hlp->name),
+                if (strncmp(hlp->name, &cmdline[start], max(str_size(hlp->name),
                     end - start + 1)) == 0) {
                         cmd = hlp;