Changeset 06b785f in mainline for kernel/generic/src/lib/string.c

Timestamp:

2009-04-01T19:11:07Z (16 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/lib/string.c (modified) (5 diffs)

kernel/generic/src/lib/string.c

@@ -70 +70 @@
  *
  * @return      Value of decoded character or '?' on decoding error.
- *
  */
 wchar_t chr_decode(const char *str, size_t *offset, size_t sz)
@@ -247 +246 @@
  *
  * @return True if character is valid Unicode code point.
- *
  */
 bool unicode_check(const wchar_t ch)
@@ -257 +255 @@
 }
 
-/** Return number of plain characters in a string.
- *
- * @param str NULL-terminated string.
- *
- * @return Number of characters in @a str.
- *
- */
-size_t strlen(const char *str)
+/** Return number of bytes the string occupies.
+ *
+ * @param str A string.
+ * @return Number of bytes in @a str excluding the null terminator.
+ */
+size_t str_size(const char *str)
 {
         size_t size;
-        for (size = 0; str[size]; size++);
-        
+
+        size = 0;
+        while (*str++ != '\0')
+                ++size;
+
         return size;
 }
@@ -347 +346 @@
  *
  * @return 0 if the strings are equal, -1 if first is smaller, 1 if second smaller.
- *
  */
 int strncmp(const char *src, const char *dst, size_t len)
@@ -381 +379 @@
  * @param dest Destination buffer.
  * @param len  Size of destination buffer.
- *
  */
 void strncpy(char *dest, const char *src, size_t len)