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

Timestamp:

2009-12-03T19:25:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9510be2

Parents:

cb3d641a (diff), 22e6802 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/src/lib/string.c (modified) (3 diffs)

kernel/generic/src/lib/string.c

@@ -537 +537 @@
  * null-terminated and containing only complete characters.
  *
- * @param dst   Destination buffer.
+ * @param dest   Destination buffer.
  * @param count Size of the destination buffer (must be > 0).
  * @param src   Source string.
@@ -571 +571 @@
  * have to be null-terminated.
  *
- * @param dst   Destination buffer.
+ * @param dest   Destination buffer.
  * @param count Size of the destination buffer (must be > 0).
  * @param src   Source string.
@@ -596 +596 @@
 }
 
-/** Copy NULL-terminated wide string to string
- *
- * Copy source wide string @a src to destination buffer @a dst.
- * No more than @a size bytes are written. NULL-terminator is always
- * written after the last succesfully copied character (i.e. if the
- * destination buffer is has at least 1 byte, it will be always
- * NULL-terminated).
- *
- * @param src   Source wide string.
- * @param dst   Destination buffer.
- * @param count Size of the destination buffer.
- *
- */
-void wstr_nstr(char *dst, const wchar_t *src, size_t size)
-{
-        /* No space for the NULL-terminator in the buffer */
-        if (size == 0)
-                return;
-        
+/** 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 = 0;
-        size_t dst_off = 0;
+        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, dst, &dst_off, size) != EOK)
+                if (chr_encode(ch, dest, &dest_off, size - 1) != EOK)
                         break;
         }
-        
-        if (dst_off >= size)
-                dst[size - 1] = 0;
-        else
-                dst[dst_off] = 0;
+
+        dest[dest_off] = '\0';
 }