Changeset ba519f7 in mainline for uspace/app/taskdump/taskdump.c

Timestamp:

2010-12-02T17:21:30Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3bd76491

Parents:

8ad673a (diff), 41a7f62 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from mainline

File:

• uspace/app/taskdump/taskdump.c (modified) (9 diffs)

uspace/app/taskdump/taskdump.c

@@ -85 +85 @@
         rc = connect_task(task_id);
         if (rc < 0) {
-                printf("Failed connecting to task %" PRIdTASKID ".\n", task_id);
+                printf("Failed connecting to task %" PRIu64 ".\n", task_id);
                 return 1;
         }
@@ -92 +92 @@
         app_symtab = NULL;
 
-        printf("Dumping task '%s' (task ID %" PRIdTASKID ").\n", app_name, task_id);
+        printf("Dumping task '%s' (task ID %" PRIu64 ").\n", app_name, task_id);
         autoload_syms();
         putchar('\n');
@@ -126 +126 @@
         if (rc < 0) {
                 printf("Error connecting\n");
-                printf("ipc_connect_task(%" PRIdTASKID ") -> %d ", task_id, rc);
+                printf("ipc_connect_task(%" PRIu64 ") -> %d ", task_id, rc);
                 return rc;
         }
@@ -168 +168 @@
                                 core_file_name = *argv;
                         } else {
-                                printf("Uknown option '%s'\n", arg[0]);
+                                printf("Uknown option '%c'\n", arg[0]);
                                 print_syntax();
                                 return -1;
@@ -240 +240 @@
         printf("Threads:\n");
         for (i = 0; i < n_threads; i++) {
-                printf(" [%d] hash: %p\n", 1+i, thash_buf[i]);
+                printf(" [%zu] hash: %p\n", 1 + i, (void *) thash_buf[i]);
 
                 thread_dump(thash_buf[i]);
@@ -284 +284 @@
         printf("Address space areas:\n");
         for (i = 0; i < n_areas; i++) {
-                printf(" [%d] flags: %c%c%c%c base: %p size: %p\n", 1+i,
+                printf(" [%zu] flags: %c%c%c%c base: %p size: %zu\n", 1 + i,
                     (ainfo_buf[i].flags & AS_AREA_READ) ? 'R' : '-',
                     (ainfo_buf[i].flags & AS_AREA_WRITE) ? 'W' : '-',
                     (ainfo_buf[i].flags & AS_AREA_EXEC) ? 'X' : '-',
                     (ainfo_buf[i].flags & AS_AREA_CACHEABLE) ? 'C' : '-',
-                    ainfo_buf[i].start_addr, ainfo_buf[i].size);
+                    (void *) ainfo_buf[i].start_addr, ainfo_buf[i].size);
         }
 
@@ -326 +326 @@
 
         sym_pc = fmt_sym_address(pc);
-        printf("Thread %p crashed at %s. FP = %p\n", thash, sym_pc, fp);
+        printf("Thread %p crashed at %s. FP = %p\n", (void *) thash,
+            sym_pc, (void *) fp);
         free(sym_pc);
 
@@ -334 +335 @@
         while (stacktrace_fp_valid(&st, fp)) {
                 sym_pc = fmt_sym_address(pc);
-                printf("  %p: %s\n", fp, sym_pc);
+                printf("  %p: %s\n", (void *) fp, sym_pc);
                 free(sym_pc);
 
@@ -457 +458 @@
 
         if (rc == EOK) {
-                rc = asprintf(&str, "%p (%s+%p)", addr, name, offs);
+                rc = asprintf(&str, "%p (%s+%zu)", (void *) addr, name, offs);
         } else {
-                rc = asprintf(&str, "%p", addr);
+                rc = asprintf(&str, "%p", (void *) addr);
         }