Changeset da0fef6 in mainline for uspace/app/bithenge/print.c

Timestamp:

2012-06-23T18:24:21Z (13 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

03b2b2c

Parents:

d5070ef

Message:

Bithenge: port to Linux and allow choosing a data source

File:

• uspace/app/bithenge/print.c (modified) (2 diffs)

uspace/app/bithenge/print.c

@@ -104 +104 @@
 static int print_string(bithenge_print_type_t type, bithenge_node_t *node)
 {
-        size_t off = 0;
         const char *value = bithenge_string_node_value(node);
-        wchar_t ch;
         printf("\"");
-        while ((ch = str_decode(value, &off, STR_NO_LIMIT)) != 0) {
+        for (string_iterator_t i = string_iterator(value); !string_iterator_done(&i); ) {
+                wchar_t ch;
+                int rc = string_iterator_next(&i, &ch);
+                if (rc != EOK)
+                        return rc;
                 if (ch == '"' || ch == '\\') {
                         printf("\\%lc", (wint_t) ch);
@@ -134 +136 @@
                         return rc;
                 for (aoff64_t i = 0; i < size; i++)
-                        printf("\\x%02x", buffer[i]);
+                        printf("\\x%02x", (unsigned int)(uint8_t)buffer[i]);
                 pos += size;
         } while (size == sizeof(buffer));