Changeset 1ccafee in mainline


Ignore:
Timestamp:
2010-01-27T22:22:09Z (14 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
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/mkfat/mkfat.c

    rfb6f1a5 r1ccafee  
    4545#include <byteorder.h>
    4646#include <sys/types.h>
     47#include <sys/typefmt.h>
    4748#include <inttypes.h>
    4849#include <errno.h>
    … …  
    159160                printf(NAME ": Warning, failed to obtain block device size.\n");
    160161        } else {
    161                 printf(NAME ": Block device has %" PRIu64 " blocks.\n",
    162                     (uint64_t) dev_nblocks);
     162                printf(NAME ": Block device has %" PRIuBN " blocks.\n",
     163                    dev_nblocks);
    163164                cfg.total_sectors = dev_nblocks;
    164165        }

  • uspace/app/taskdump/taskdump.c

    rfb6f1a5 r1ccafee  
    4141#include <task.h>
    4242#include <kernel/mm/as.h>
     43#include <sys/types.h>
     44#include <sys/typefmt.h>
    4345#include <libarch/istate.h>
    4446#include <macros.h>
    … …  
    9395        rc = connect_task(task_id);
    9496        if (rc < 0) {
    95                 printf("Failed connecting to task %lld.\n", task_id);
     97                printf("Failed connecting to task %" PRIdTASKID ".\n", task_id);
    9698                return 1;
    9799        }
    … …  
    100102        app_symtab = NULL;
    101103
    102         printf("Dumping task '%s' (task ID %lld).\n", app_name, task_id);
     104        printf("Dumping task '%s' (task ID %" PRIdTASKID ").\n", app_name, task_id);
    103105        autoload_syms();
    104106        putchar('\n');
    … …  
    134136        if (rc < 0) {
    135137                printf("Error connecting\n");
    136                 printf("ipc_connect_task(%lld) -> %d ", task_id, rc);
     138                printf("ipc_connect_task(%" PRIdTASKID ") -> %d ", task_id, rc);
    137139                return rc;
    138140        }

  • uspace/app/trace/ipcp.c

    rfb6f1a5 r1ccafee  
    3636#include <stdlib.h>
    3737#include <adt/hash_table.h>
     38#include <sys/typefmt.h>
    3839
    3940#include "ipc_desc.h"
    … …  
    200201
    201202        if ((display_mask & DM_IPC) != 0) {
    202                 printf("Call ID: 0x%lx, phone: %d, proto: %s, method: ", hash,
     203                printf("Call ID: %p, phone: %d, proto: %s, method: ", hash,
    203204                        phone, (proto ? proto->name : "n/a"));
    204205                ipc_m_print(proto, IPC_GET_METHOD(*call));
    205                 printf(" args: (%lu, %lu, %lu, %lu, %lu)\n", args[1], args[2],
     206                printf(" args: (%" PRIuIPCARG ", %" PRIuIPCARG ", %" PRIuIPCARG
     207                    ", %" PRIuIPCARG ", %" PRIuIPCARG ")\n", args[1], args[2],
    206208                    args[3], args[4], args[5]);
    207209        }
    … …  
    279281
    280282        if ((display_mask & DM_IPC) != 0) {
    281                 printf("Response to %p: retval=%ld, args = (%lu, %lu, %lu, %lu, %lu)\n",
    282                         hash, retval, IPC_GET_ARG1(*answer),
    283                         IPC_GET_ARG2(*answer), IPC_GET_ARG3(*answer),
    284                         IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer));
     283                printf("Response to %p: retval=%ld, args = (%" PRIuIPCARG
     284                    ", %" PRIuIPCARG ", %" PRIuIPCARG ", %" PRIuIPCARG
     285                    ", %" PRIuIPCARG ")\n",
     286                    hash, retval, IPC_GET_ARG1(*answer),
     287                    IPC_GET_ARG2(*answer), IPC_GET_ARG3(*answer),
     288                    IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer));
    285289        }
    286290

  • uspace/app/trace/trace.c

    rfb6f1a5 r1ccafee  
    4949#include <io/keycode.h>
    5050#include <fibril_synch.h>
     51#include <sys/types.h>
     52#include <sys/typefmt.h>
    5153
    5254#include <libc.h>
    … …  
    159161        if (rc < 0) {
    160162                printf("Error connecting\n");
    161                 printf("ipc_connect_task(%lld) -> %d ", task_id, rc);
     163                printf("ipc_connect_task(%" PRIdTASKID ") -> %d ", task_id, rc);
    162164                return rc;
    163165        }
    … …  
    275277
    276278        putchar('(');
    277         if (n > 0) printf("%ld", sc_args[0]);
     279        if (n > 0) printf("%" PRIdSYSARG, sc_args[0]);
    278280        for (i = 1; i < n; i++) {
    279                 printf(", %ld", sc_args[i]);
     281                printf(", %" PRIdSYSARG, sc_args[i]);
    280282        }
    281283        putchar(')');
    … …  
    972974        rc = connect_task(task_id);
    973975        if (rc < 0) {
    974                 printf("Failed connecting to task %lld.\n", task_id);
     976                printf("Failed connecting to task %" PRIdTASKID ".\n", task_id);
    975977                return 1;
    976978        }
    977979
    978         printf("Connected to task %lld.\n", task_id);
     980        printf("Connected to task %" PRIdTASKID ".\n", task_id);
    979981
    980982        if (task_ldr != NULL)

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

    rfb6f1a5 r1ccafee  
    5454#include <devmap.h>
    5555#include <sys/types.h>
     56#include <sys/typefmt.h>
    5657#include <inttypes.h>
    5758#include <libblock.h>
    … …  
    198199                    / (1024 * 1024);
    199200                printf(NAME ": Registered device %s: %" PRIu64 " blocks "
    200                     "%" PRIu64 " MB.\n", name, (uint64_t) part->length, size_mb);
     201                    "%" PRIuBN " MB.\n", name, part->length, size_mb);
    201202
    202203                part->dev = dev;

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

    rfb6f1a5 r1ccafee  
    6464#include <devmap.h>
    6565#include <sys/types.h>
     66#include <sys/typefmt.h>
    6667#include <inttypes.h>
    6768#include <libblock.h>
    … …  
    248249                size_mb = (part->length * block_size + 1024 * 1024 - 1)
    249250                    / (1024 * 1024);
    250                 printf(NAME ": Registered device %s: %" PRIu64 " blocks "
    251                     "%" PRIu64 " MB.\n",
    252                     name, (uint64_t) part->length, size_mb);
     251                printf(NAME ": Registered device %s: %" PRIuBN " blocks "
     252                    "%" PRIu64 " MB.\n", name, part->length, size_mb);
    253253
    254254                part->dev = dev;
    … …  
    336336                rc = block_read_direct(indev_handle, ba, 1, brb);
    337337                if (rc != EOK) {
    338                         printf(NAME ": Failed reading EBR block at %u.\n", ba);
     338                        printf(NAME ": Failed reading EBR block at %"
     339                            PRIu32 ".\n", ba);
    339340                        return rc;
    340341                }

  • uspace/srv/taskmon/taskmon.c

    rfb6f1a5 r1ccafee  
    3939#include <async.h>
    4040#include <ipc/services.h>
     41#include <sys/typefmt.h>
    4142#include <task.h>
    4243#include <event.h>
    … …  
    6061        thread = IPC_GET_ARG3(*call);
    6162
    62         if (asprintf(&s_taskid, "%lld", taskid) < 0) {
     63        if (asprintf(&s_taskid, "%" PRIuTASKID, taskid) < 0) {
    6364                printf("Memory allocation failed.\n");
    6465                return;
    6566        }
    6667
    67         if (asprintf(&dump_fname, "/scratch/d%lld.txt", taskid) < 0) {
     68        if (asprintf(&dump_fname, "/scratch/d" PRIuTASKID ".txt", taskid) < 0) {
    6869                printf("Memory allocation failed.\n");
    6970                return;
    7071        }
    7172
    72         printf(NAME ": Task %lld fault in thread %p.\n", taskid, thread);
     73        printf(NAME ": Task %" PRIuTASKID " fault in thread %p.\n", taskid, thread);
    7374
    7475#ifdef CONFIG_VERBOSE_DUMPS
Note: See TracChangeset for help on using the changeset viewer.