Changeset 61e29a4d in mainline

Timestamp:

2011-06-25T05:23:41Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

2e839dda

Parents:

2d0d637

Message:

Modifications in str.c

1. Add function wstr_is_ascii
2. Add return value (error code) to functions: wstr_to_str and str_to_wstr

Location:

uspace/lib/c

Files:

• generic/str.c (modified) (6 diffs)
• include/str.h (modified) (2 diffs)

uspace/lib/c/generic/str.c

@@ -366 +366 @@
 }
 
+/** Check whether wide string is plain ASCII.
+ *
+ * @return True if wide string is plain ASCII.
+ *
+ */
+bool wstr_is_ascii(const wchar_t *wstr)
+{
+        while (*wstr && ascii_check(*wstr))
+                wstr++;
+        return *wstr == 0;
+}
+
 /** Check whether character is valid
  *
@@ -552 +564 @@
  * @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)
-{
+ *
+ * @return EOK, if success, negative otherwise.
+ */
+int wstr_to_str(char *dest, size_t size, const wchar_t *src)
+{
+        int rc;
         wchar_t ch;
         size_t src_idx;
@@ -566 +581 @@
 
         while ((ch = src[src_idx++]) != 0) {
-                if (chr_encode(ch, dest, &dest_off, size - 1) != EOK)
+                rc = chr_encode(ch, dest, &dest_off, size - 1);
+                if (rc != EOK)
                         break;
         }
 
         dest[dest_off] = '\0';
+        return rc;
 }
 
@@ -631 +648 @@
  * @param dlen  Length of destination buffer (number of wchars).
  * @param src   Source string.
- */
-void str_to_wstr(wchar_t *dest, size_t dlen, const char *src)
-{
+ *
+ * @return EOK, if success, negative otherwise.
+ */
+int str_to_wstr(wchar_t *dest, size_t dlen, const char *src)
+{
+        int rc=EOK;
         size_t offset;
         size_t di;
@@ -644 +664 @@
 
         do {
-                if (di >= dlen - 1)
+                if (di >= dlen - 1) {
+                        rc = EOVERFLOW;
                         break;
+                }
 
                 c = str_decode(src, &offset, STR_NO_LIMIT);
@@ -652 +674 @@
 
         dest[dlen - 1] = '\0';
+        return rc;
 }
 

uspace/lib/c/include/str.h

@@ -65 +65 @@
 extern bool ascii_check(wchar_t ch);
 extern bool chr_check(wchar_t ch);
+extern bool wstr_is_ascii(const wchar_t *wstr);
 
 extern int str_cmp(const char *s1, const char *s2);
@@ -73 +74 @@
 extern void str_append(char *dest, size_t size, const char *src);
 
-extern void wstr_to_str(char *dest, size_t size, const wchar_t *src);
+extern int 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 int str_to_wstr(wchar_t *dest, size_t dlen, const char *src);
 
 extern char *str_chr(const char *str, wchar_t ch);