Changes in kernel/generic/src/lib/str.c [aafed15:d066259] in mainline

File:

• kernel/generic/src/lib/str.c (modified) (4 diffs)

kernel/generic/src/lib/str.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2008 Jiri Svoboda
+ * Copyright (c) 2011 Martin Sucha
+ * Copyright (c) 2011 Oleg Romanenko
  * All rights reserved.
  *
@@ -103 +107 @@
 
 #include <str.h>
-#include <cpu.h>
-#include <arch/asm.h>
-#include <arch.h>
+
+#include <assert.h>
 #include <errno.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+
 #include <align.h>
-#include <assert.h>
 #include <macros.h>
-#include <stdlib.h>
 
 /** Check the condition if wchar_t is signed */
@@ -616 +622 @@
 }
 
+/** Convert wide string to string.
+ *
+ * Convert wide string @a src to string. The output is written to the buffer
+ * specified by @a dest and @a size. @a size must be non-zero and the string
+ * written will always be well-formed.
+ *
+ * @param dest  Destination buffer.
+ * @param size  Size of the destination buffer.
+ * @param src   Source wide string.
+ */
+void wstr_to_str(char *dest, size_t size, const wchar_t *src)
+{
+        wchar_t ch;
+        size_t src_idx;
+        size_t dest_off;
+
+        /* There must be space for a null terminator in the buffer. */
+        assert(size > 0);
+
+        src_idx = 0;
+        dest_off = 0;
+
+        while ((ch = src[src_idx++]) != 0) {
+                if (chr_encode(ch, dest, &dest_off, size - 1) != EOK)
+                        break;
+        }
+
+        dest[dest_off] = '\0';
+}
+
+/** Find first occurence of character in string.
+ *
+ * @param str String to search.
+ * @param ch  Character to look for.
+ *
+ * @return Pointer to character in @a str or NULL if not found.
+ */
+char *str_chr(const char *str, wchar_t ch)
+{
+        wchar_t acc;
+        size_t off = 0;
+        size_t last = 0;
+
+        while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
+                if (acc == ch)
+                        return (char *) (str + last);
+                last = off;
+        }
+
+        return NULL;
+}
+
+/** Insert a wide character into a wide string.
+ *
+ * Insert a wide character into a wide string at position
+ * @a pos. The characters after the position are shifted.
+ *
+ * @param str     String to insert to.
+ * @param ch      Character to insert to.
+ * @param pos     Character index where to insert.
+ * @param max_pos Characters in the buffer.
+ *
+ * @return True if the insertion was sucessful, false if the position
+ *         is out of bounds.
+ *
+ */
+bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos)
+{
+        size_t len = wstr_length(str);
+
+        if ((pos > len) || (pos + 1 > max_pos))
+                return false;
+
+        size_t i;
+        for (i = len; i + 1 > pos; i--)
+                str[i + 1] = str[i];
+
+        str[pos] = ch;
+
+        return true;
+}
+
+/** Remove a wide character from a wide string.
+ *
+ * Remove a wide character from a wide string at position
+ * @a pos. The characters after the position are shifted.
+ *
+ * @param str String to remove from.
+ * @param pos Character index to remove.
+ *
+ * @return True if the removal was sucessful, false if the position
+ *         is out of bounds.
+ *
+ */
+bool wstr_remove(wchar_t *str, size_t pos)
+{
+        size_t len = wstr_length(str);
+
+        if (pos >= len)
+                return false;
+
+        size_t i;
+        for (i = pos + 1; i <= len; i++)
+                str[i - 1] = str[i];
+
+        return true;
+}
+
 /** Duplicate string.
  *
@@ -675 +789 @@
         str_ncpy(dest, size + 1, src, size);
         return dest;
-}
-
-/** Convert wide string to string.
- *
- * Convert wide string @a src to string. The output is written to the buffer
- * specified by @a dest and @a size. @a size must be non-zero and the string
- * written will always be well-formed.
- *
- * @param dest  Destination buffer.
- * @param size  Size of the destination buffer.
- * @param src   Source wide string.
- */
-void wstr_to_str(char *dest, size_t size, const wchar_t *src)
-{
-        wchar_t ch;
-        size_t src_idx;
-        size_t dest_off;
-
-        /* There must be space for a null terminator in the buffer. */
-        assert(size > 0);
-
-        src_idx = 0;
-        dest_off = 0;
-
-        while ((ch = src[src_idx++]) != 0) {
-                if (chr_encode(ch, dest, &dest_off, size - 1) != EOK)
-                        break;
-        }
-
-        dest[dest_off] = '\0';
-}
-
-/** Find first occurence of character in string.
- *
- * @param str String to search.
- * @param ch  Character to look for.
- *
- * @return Pointer to character in @a str or NULL if not found.
- *
- */
-char *str_chr(const char *str, wchar_t ch)
-{
-        wchar_t acc;
-        size_t off = 0;
-        size_t last = 0;
-
-        while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
-                if (acc == ch)
-                        return (char *) (str + last);
-                last = off;
-        }
-
-        return NULL;
-}
-
-/** Insert a wide character into a wide string.
- *
- * Insert a wide character into a wide string at position
- * @a pos. The characters after the position are shifted.
- *
- * @param str     String to insert to.
- * @param ch      Character to insert to.
- * @param pos     Character index where to insert.
- * @param max_pos Characters in the buffer.
- *
- * @return True if the insertion was sucessful, false if the position
- *         is out of bounds.
- *
- */
-bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos)
-{
-        size_t len = wstr_length(str);
-
-        if ((pos > len) || (pos + 1 > max_pos))
-                return false;
-
-        size_t i;
-        for (i = len; i + 1 > pos; i--)
-                str[i + 1] = str[i];
-
-        str[pos] = ch;
-
-        return true;
-}
-
-/** Remove a wide character from a wide string.
- *
- * Remove a wide character from a wide string at position
- * @a pos. The characters after the position are shifted.
- *
- * @param str String to remove from.
- * @param pos Character index to remove.
- *
- * @return True if the removal was sucessful, false if the position
- *         is out of bounds.
- *
- */
-bool wstr_remove(wchar_t *str, size_t pos)
-{
-        size_t len = wstr_length(str);
-
-        if (pos >= len)
-                return false;
-
-        size_t i;
-        for (i = pos + 1; i <= len; i++)
-                str[i - 1] = str[i];
-
-        return true;
 }