Changeset d09f84e6 in mainline

Timestamp:

2009-04-02T19:59:22Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

82bb9c1

Parents:

06b785f

Message:

Return error code from chr_encode() rather than boolean.

Location:

kernel/generic

Files:

• include/string.h (modified) (1 diff)
• src/lib/string.c (modified) (5 diffs)
• src/printf/vsnprintf.c (modified) (3 diffs)

kernel/generic/include/string.h

@@ -43 +43 @@
 
 extern wchar_t chr_decode(const char *, size_t *, size_t);
-extern bool chr_encode(const wchar_t, char *, size_t *, size_t);
+extern int chr_encode(const wchar_t, char *, size_t *, size_t);
 
 extern size_t str_size(const char *str);

kernel/generic/src/lib/string.c

@@ -41 +41 @@
 #include <arch/asm.h>
 #include <arch.h>
+#include <errno.h>
 #include <console/kconsole.h>
 
@@ -141 +142 @@
  * @param sz            Size of the output buffer.
  *
- * @return True if the character was encoded successfully or false if there
- *         was not enough space in the output buffer or the character code
- *         was invalid.
- */
-bool chr_encode(const wchar_t ch, char *str, size_t *offset, size_t sz)
+ * @return EOK if the character was encoded successfully, EOVERFLOW if there
+ *         was not enough space in the output buffer or EINVAL if the character
+ *         code was invalid.
+ */
+int chr_encode(const wchar_t ch, char *str, size_t *offset, size_t sz)
 {
         uint32_t cc;            /* Unsigned version of ch. */
@@ -154 +155 @@
 
         if (*offset >= sz)
-                return false;
+                return EOVERFLOW;
 
         if (ch < 0)
-                return false;
+                return EINVAL;
 
         /* Bit operations should only be done on unsigned numbers. */
@@ -177 +178 @@
         } else {
                 /* Codes longer than 21 bits are not supported. */
-                return false;
+                return EINVAL;
         }
 
         /* Check for available space in buffer. */
         if (*offset + cbytes >= sz)
-                return false;
+                return EOVERFLOW;
 
         /* Encode continuation bytes. */
@@ -196 +197 @@
         *offset += (1 + cbytes);
         
-        return true;
+        return EOK;
 }
 

kernel/generic/src/printf/vsnprintf.c

@@ -37 +37 @@
 #include <string.h>
 #include <memstr.h>
+#include <errno.h>
 
 typedef struct {
@@ -87 +88 @@
                         wchar_t uc = chr_decode(str, &index, size);
 
-                        if (!chr_encode(uc, data->dst, &data->len, data->size - 1))
+                        if (chr_encode(uc, data->dst, &data->len, data->size - 1) != EOK)
                                 break;
                 }
@@ -147 +148 @@
                 }
                 
-                if (!chr_encode(str[index], data->dst, &data->len, data->size - 1))
+                if (chr_encode(str[index], data->dst, &data->len, data->size - 1) != EOK)
                         break;