Changeset 1ccafee in mainline for uspace/srv

Timestamp:

2010-01-27T22:22:09Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0b9ac3c, a9bbe48d

Parents:

fb6f1a5

Message:

Add type formatting macros for HelenOS system types (sys/typefmt.h) and use in appropriate places.

Location:

uspace/srv

Files:

• bd/part/guid_part/guid_part.c (modified) (2 diffs)
• bd/part/mbr_part/mbr_part.c (modified) (3 diffs)
• taskmon/taskmon.c (modified) (2 diffs)

uspace/srv/bd/part/guid_part/guid_part.c

@@ -54 +54 @@
 #include <devmap.h>
 #include <sys/types.h>
+#include <sys/typefmt.h>
 #include <inttypes.h>
 #include <libblock.h>
@@ -198 +199 @@
                     / (1024 * 1024);
                 printf(NAME ": Registered device %s: %" PRIu64 " blocks "
-                    "%" PRIu64 " MB.\n", name, (uint64_t) part->length, size_mb);
+                    "%" PRIuBN " MB.\n", name, part->length, size_mb);
 
                 part->dev = dev;

uspace/srv/bd/part/mbr_part/mbr_part.c

@@ -64 +64 @@
 #include <devmap.h>
 #include <sys/types.h>
+#include <sys/typefmt.h>
 #include <inttypes.h>
 #include <libblock.h>
@@ -248 +249 @@
                 size_mb = (part->length * block_size + 1024 * 1024 - 1)
                     / (1024 * 1024);
-                printf(NAME ": Registered device %s: %" PRIu64 " blocks "
-                    "%" PRIu64 " MB.\n",
-                    name, (uint64_t) part->length, size_mb);
+                printf(NAME ": Registered device %s: %" PRIuBN " blocks "
+                    "%" PRIu64 " MB.\n", name, part->length, size_mb);
 
                 part->dev = dev;
@@ -336 +336 @@
                 rc = block_read_direct(indev_handle, ba, 1, brb);
                 if (rc != EOK) {
-                        printf(NAME ": Failed reading EBR block at %u.\n", ba);
+                        printf(NAME ": Failed reading EBR block at %"
+                            PRIu32 ".\n", ba);
                         return rc;
                 }

uspace/srv/taskmon/taskmon.c

@@ -39 +39 @@
 #include <async.h>
 #include <ipc/services.h>
+#include <sys/typefmt.h>
 #include <task.h>
 #include <event.h>
@@ -60 +61 @@
         thread = IPC_GET_ARG3(*call);
 
-        if (asprintf(&s_taskid, "%lld", taskid) < 0) {
+        if (asprintf(&s_taskid, "%" PRIuTASKID, taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;
         }
 
-        if (asprintf(&dump_fname, "/scratch/d%lld.txt", taskid) < 0) {
+        if (asprintf(&dump_fname, "/scratch/d" PRIuTASKID ".txt", taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;
         }
 
-        printf(NAME ": Task %lld fault in thread %p.\n", taskid, thread);
+        printf(NAME ": Task %" PRIuTASKID " fault in thread %p.\n", taskid, thread);
 
 #ifdef CONFIG_VERBOSE_DUMPS