Changeset 8e893ae in mainline

Timestamp:

2012-04-07T17:49:43Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c7afcba7

Parents:

a4a0f1d

Message:

avoid comparison with 0 if the type is unsigned

Files:

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

boot/generic/src/str.c

@@ -100 +100 @@
 #include <str.h>
 #include <errno.h>
+
+/** Check the condition if wchar_t is signed */
+#ifdef WCHAR_IS_UNSIGNED
+        #define WCHAR_SIGNED_CHECK(cond)  (true)
+#else
+        #define WCHAR_SIGNED_CHECK(cond)  (cond)
+#endif
 
 /** Byte mask consisting of lowest @n bits (out of 8) */
@@ -198 +205 @@
  *         code was invalid.
  */
-int chr_encode(wchar_t ch, char *str, size_t *offset, size_t size)
+int chr_encode(const wchar_t ch, char *str, size_t *offset, size_t size)
 {
         if (*offset >= size)
@@ -325 +332 @@
 bool ascii_check(wchar_t ch)
 {
-        if ((ch >= 0) && (ch <= 127))
+        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 127))
                 return true;
         
@@ -338 +345 @@
 bool chr_check(wchar_t ch)
 {
-        if ((ch >= 0) && (ch <= 1114111))
+        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 1114111))
                 return true;
         

kernel/generic/src/lib/str.c

@@ -111 +111 @@
 #include <debug.h>
 #include <macros.h>
+
+/** Check the condition if wchar_t is signed */
+#ifdef WCHAR_IS_UNSIGNED
+        #define WCHAR_SIGNED_CHECK(cond)  (true)
+#else
+        #define WCHAR_SIGNED_CHECK(cond)  (cond)
+#endif
 
 /** Byte mask consisting of lowest @n bits (out of 8) */
@@ -206 +213 @@
  *
  * @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(wchar_t ch, char *str, size_t *offset, size_t size)
+ *         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 size)
 {
         if (*offset >= size)
@@ -427 +434 @@
 bool ascii_check(wchar_t ch)
 {
-        if ((ch >= 0) && (ch <= 127))
+        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 127))
                 return true;
         
@@ -440 +447 @@
 bool chr_check(wchar_t ch)
 {
-        if ((ch >= 0) && (ch <= 1114111))
+        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 1114111))
                 return true;
         

uspace/lib/c/generic/str.c

@@ -46 +46 @@
 #include <mem.h>
 #include <str.h>
+
+/** Check the condition if wchar_t is signed */
+#ifdef WCHAR_IS_UNSIGNED
+        #define WCHAR_SIGNED_CHECK(cond)  (true)
+#else
+        #define WCHAR_SIGNED_CHECK(cond)  (cond)
+#endif
 
 /** Byte mask consisting of lowest @n bits (out of 8) */
@@ -399 +406 @@
 bool ascii_check(wchar_t ch)
 {
-        if ((ch >= 0) && (ch <= 127))
+        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 127))
                 return true;
         
@@ -412 +419 @@
 bool chr_check(wchar_t ch)
 {
-        if ((ch >= 0) && (ch <= 1114111))
+        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 1114111))
                 return true;
         
@@ -513 +520 @@
  * @param count Size of the destination buffer (must be > 0).
  * @param src   Source string.
+ *
  */
 void str_cpy(char *dest, size_t size, const char *src)
@@ -545 +553 @@
  * @param src   Source string.
  * @param n     Maximum number of bytes to read from @a src.
+ *
  */
 void str_ncpy(char *dest, size_t size, const char *src, size_t n)