diff options
| author | neal <neal> | 2007-12-24 07:59:03 +0000 |
|---|---|---|
| committer | neal <neal> | 2007-12-24 07:59:03 +0000 |
| commit | 0659606292974747ae46580170271a990c0abf53 (patch) | |
| tree | 844a2c21063f756341024335e66c0b1f9eece057 /viengoos/as.c | |
| parent | 7de5b1ddc13636b4f36ad6022e964aa2ce6d8dc4 (diff) | |
hurd/
2007-12-24 Neal H. Walfield <neal@gnu.org>
* cap.h (OID_FMT) [RM_INTERN]: Define.
(OID_PRINTF) [RM_INTERN]: Likewise.
viengoos/
2007-12-24 Neal H. Walfield <neal@gnu.org>
* as.c (as_build_internal): Include "output.h".
* cap-lookup.c (lookup): Use OID_FMT and OID_PRINTF rather than
assuming OID's type.
* as.c (as_build_internal): Likewise.
Diffstat (limited to 'viengoos/as.c')
| -rw-r--r-- | viengoos/as.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/viengoos/as.c b/viengoos/as.c index 43f18f4..047c548 100644 --- a/viengoos/as.c +++ b/viengoos/as.c @@ -29,6 +29,7 @@ #include "as.h" #include "bits.h" #include "rm.h" +#include "output.h" #ifdef RM_INTERN #include "object.h" @@ -59,7 +60,9 @@ as_build_internal (activity_t activity, addr_t addr), bool may_overwrite) { +#ifdef RM_INTERN struct cap *start = root; +#endif assert (! ADDR_IS_VOID (a)); @@ -152,8 +155,8 @@ as_build_internal (activity_t activity, #ifdef RM_INTERN if (! object) { - debug (1, "Failed to get object with OID %llx", - root->oid); + debug (1, "Failed to get object with OID " OID_FMT, + OID_PRINTF (root->oid)); return false; } #else @@ -533,7 +536,7 @@ do_walk (activity_t activity, int index, struct cap *root, addr_t addr, addr_depth (addr) + CAP_GUARD_BITS (&cap)); #ifdef RM_INTERN - printf ("@%llx ", cap.oid); + printf ("@" OID_FMT, OID_PRINTF (cap.oid)); #endif printf ("%s", cap_type_string (cap.type)); |