Changeset 1433ecda in mainline for uspace/lib/c/generic/str.c

Timestamp:

2018-04-04T15:42:37Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2c4e1cc

Parents:

47b2d7e3

Message:

Fix cstyle: make ccheck-fix and commit only files where all the changes are good.

File:

• uspace/lib/c/generic/str.c (modified) (5 diffs)

uspace/lib/c/generic/str.c

@@ -49 +49 @@
 /** Check the condition if wchar_t is signed */
 #ifdef __WCHAR_UNSIGNED__
-        #define WCHAR_SIGNED_CHECK(cond)  (true)
+#define WCHAR_SIGNED_CHECK(cond)  (true)
 #else
-        #define WCHAR_SIGNED_CHECK(cond)  (cond)
+#define WCHAR_SIGNED_CHECK(cond)  (cond)
 #endif
 
@@ -164 +164 @@
                         /* 0xxxxxxx (Plain ASCII) */
                         return b & 0x7f;
-                }
-                else if ((b & 0xe0) == 0xc0 || (b & 0xf0) == 0xe0 ||
+                } else if ((b & 0xe0) == 0xc0 || (b & 0xf0) == 0xe0 ||
                     (b & 0xf8) == 0xf0) {
                         /* Start byte */
                         size_t start_offset = *offset;
                         return str_decode(str, &start_offset, size);
-                }
-                else if ((b & 0xc0) != 0x80) {
+                } else if ((b & 0xc0) != 0x80) {
                         /* Not a continuation byte */
                         return U_SPECIAL;
@@ -936 +934 @@
                                 ch += (src[idx + 1] & 0x03FF);
                                 idx += 2;
-                        }
-                        else
+                        } else
                                 break;
                 } else {
@@ -983 +980 @@
                         idx++;
                 } else {
-                         dest[idx] = c;
+                        dest[idx] = c;
                 }
 
@@ -1110 +1107 @@
         size_t len = str_length(str);
 
-        wchar_t *wstr = calloc(len+1, sizeof(wchar_t));
+        wchar_t *wstr = calloc(len + 1, sizeof(wchar_t));
         if (wstr == NULL)
                 return NULL;