Changeset abb7491c in mainline for uspace/lib/c/generic/str.c

Timestamp:

2011-08-25T21:42:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ff0c270

Parents:

81e20c7

Message:

Cstyle.

File:

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

uspace/lib/c/generic/str.c

@@ -655 +655 @@
 int utf16_to_str(char *dest, size_t size, const uint16_t *src)
 {
-        size_t idx=0, dest_off=0;
+        size_t idx = 0, dest_off = 0;
         wchar_t ch;
         int rc = EOK;
@@ -664 +664 @@
         while (src[idx]) {
                 if ((src[idx] & 0xfc00) == 0xd800) {
-                        if (src[idx+1] && (src[idx+1] & 0xfc00) == 0xdc00) {
+                        if (src[idx + 1] && (src[idx + 1] & 0xfc00) == 0xdc00) {
                                 ch = 0x10000;
                                 ch += (src[idx] & 0x03FF) << 10;
-                                ch += (src[idx+1] & 0x03FF);
+                                ch += (src[idx + 1] & 0x03FF);
                                 idx += 2;
                         }
@@ -676 +676 @@
                         idx++;
                 }
-                rc = chr_encode(ch, dest, &dest_off, size-1);
+                rc = chr_encode(ch, dest, &dest_off, size - 1);
                 if (rc != EOK)
                         break;
@@ -686 +686 @@
 int str_to_utf16(uint16_t *dest, size_t size, const char *src)
 {
-        int rc=EOK;
-        size_t offset=0;
-        size_t idx=0;
+        int rc = EOK;
+        size_t offset = 0;
+        size_t idx = 0;
         wchar_t c;
 
@@ -695 +695 @@
         while ((c = str_decode(src, &offset, STR_NO_LIMIT)) != 0) {
                 if (c > 0x10000) {
-                        if (idx+2 >= size-1) {
-                                rc=EOVERFLOW;
+                        if (idx + 2 >= size - 1) {
+                                rc = EOVERFLOW;
                                 break;
                         }
                         c = (c - 0x10000);
                         dest[idx] = 0xD800 | (c >> 10);
-                        dest[idx+1] = 0xDC00 | (c & 0x3FF);
+                        dest[idx + 1] = 0xDC00 | (c & 0x3FF);
                         idx++;
                 } else {
@@ -708 +708 @@
 
                 idx++;
-                if (idx >= size-1) {
-                        rc=EOVERFLOW;
+                if (idx >= size - 1) {
+                        rc = EOVERFLOW;
                         break;
                 }