Changeset 81e9cb3 in mainline

Timestamp:

2011-08-24T21:51:57Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

26ad20b

Parents:

980311e

Message:

Make wstr_to_str() and str_to_wstr() void functions again.

Location:

uspace/lib/c

Files:

• generic/str.c (modified) (5 diffs)
• include/str.h (modified) (1 diff)

uspace/lib/c/generic/str.c

@@ -620 +620 @@
  * @param size  Size of the destination buffer.
  * @param src   Source wide string.
- *
- * @return EOK, if success, negative otherwise.
- */
-int wstr_to_str(char *dest, size_t size, const wchar_t *src)
-{
-        int rc;
+ */
+void wstr_to_str(char *dest, size_t size, const wchar_t *src)
+{
         wchar_t ch;
         size_t src_idx;
@@ -637 +634 @@
 
         while ((ch = src[src_idx++]) != 0) {
-                rc = chr_encode(ch, dest, &dest_off, size - 1);
-                if (rc != EOK)
+                if (chr_encode(ch, dest, &dest_off, size - 1) != EOK)
                         break;
         }
 
         dest[dest_off] = '\0';
-        return rc;
 }
 
@@ -782 +777 @@
  * @param dlen  Length of destination buffer (number of wchars).
  * @param src   Source string.
- *
- * @return EOK, if success, negative otherwise.
- */
-int str_to_wstr(wchar_t *dest, size_t dlen, const char *src)
-{
-        int rc=EOK;
+ */
+void str_to_wstr(wchar_t *dest, size_t dlen, const char *src)
+{
         size_t offset;
         size_t di;
@@ -798 +790 @@
 
         do {
-                if (di >= dlen - 1) {
-                        rc = EOVERFLOW;
+                if (di >= dlen - 1)
                         break;
-                }
 
                 c = str_decode(src, &offset, STR_NO_LIMIT);
@@ -808 +798 @@
 
         dest[dlen - 1] = '\0';
-        return rc;
 }
 

uspace/lib/c/include/str.h

@@ -80 +80 @@
 extern void str_append(char *dest, size_t size, const char *src);
 
-extern int wstr_to_str(char *dest, size_t size, const wchar_t *src);
 extern int spascii_to_str(char *dest, size_t size, const uint8_t *src, size_t n);
+extern void wstr_to_str(char *dest, size_t size, const wchar_t *src);
 extern char *wstr_to_astr(const wchar_t *src);
+extern void str_to_wstr(wchar_t *dest, size_t dlen, const char *src);
 extern wchar_t *str_to_awstr(const char *src);
-extern int str_to_wstr(wchar_t *dest, size_t dlen, const char *src);
 extern int utf16_to_str(char *dest, size_t size, const uint16_t *src);
 extern int str_to_utf16(uint16_t *dest, size_t size, const char *src);