Changeset a7b1071 in mainline

Timestamp:

2009-04-03T19:48:10Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

7a2c479

Parents:

c8bf88d

Message:

Fix bugs in kconsole, simplify string comparisons.

Location:

kernel/generic/src

Files:

• console/kconsole.c (modified) (1 diff)
• lib/string.c (modified) (5 diffs)

kernel/generic/src/console/kconsole.c

@@ -510 +510 @@
                 prev = offset;
         }
-        *end = offset;
+        *end = prev;
         
         return found_start;

kernel/generic/src/lib/string.c

@@ -459 +459 @@
 int str_cmp(const char *s1, const char *s2)
 {
-        wchar_t c1;
-        wchar_t c2;
+        wchar_t c1 = 0;
+        wchar_t c2 = 0;
         
         size_t off1 = 0;
         size_t off2 = 0;
-        
-        while ((c1 = str_decode(s1, &off1, STR_NO_LIMIT) != 0)
-            && (c2 = str_decode(s2, &off2, STR_NO_LIMIT) != 0)) {
-                
-                if (off1 != off2)
-                        break;
-                
+
+        while (true) {
+                c1 = str_decode(s1, &off1, STR_NO_LIMIT);
+                c2 = str_decode(s2, &off2, STR_NO_LIMIT);
+
                 if (c1 < c2)
                         return -1;
@@ -476 +474 @@
                 if (c1 > c2)
                         return 1;
-        }
-        
-        if ((off1 == off2) && (c1 == c2))
-                return 0;
-        
-        if ((c1 == 0) || (off1 < off2))
-                return -1;
-        
-        return 1;
+
+                if (c1 == 0 || c2 == 0)
+                        break;          
+        }
+
+        return 0;
 }
 
@@ -510 +505 @@
         
         count_t len = 0;
-        
-        while ((len < max_len)
-            && ((c1 = str_decode(s1, &off1, STR_NO_LIMIT)) != 0)
-            && ((c2 = str_decode(s2, &off2, STR_NO_LIMIT)) != 0)) {
-                
-                if (off1 != off2)
+
+        while (true) {
+                if (len >= max_len)
                         break;
-                
+
+                c1 = str_decode(s1, &off1, STR_NO_LIMIT);
+                c2 = str_decode(s2, &off2, STR_NO_LIMIT);
+
                 if (c1 < c2)
                         return -1;
-                
+
                 if (c1 > c2)
                         return 1;
-                
-                len++;
-        }
-        
-        if ((off1 == off2) && (len == max_len) && (c1 == c2))
-                return 0;
-        
-        if ((c1 == 0) || (off1 < off2))
-                return -1;
-        
-        return 1;
+
+                if (c1 == 0 || c2 == 0)
+                        break;
+
+                ++len;  
+        }
+
+        return 0;
+
 }
 
@@ -559 +552 @@
         size_t dst_off = 0;
         
-        while ((ch = str_decode(src, &str_off, STR_NO_LIMIT) != 0)) {
+        while ((ch = str_decode(src, &str_off, STR_NO_LIMIT)) != 0) {
                 if (chr_encode(ch, dst, &dst_off, size) != EOK)
                         break;
@@ -617 +610 @@
         size_t off = 0;
         
-        while ((acc = str_decode(str, &off, STR_NO_LIMIT) != 0)) {
+        while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
                 if (acc == ch)
                         return (str + off);