diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-11-11 10:49:55 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:46:12 -0500 |
| commit | 1598aaca9579f4e2ca9d1fd539693969a2319a4b (patch) | |
| tree | bb04fd1e4ee49981f6e0a529cf227d0682bf56fc | |
| parent | 7935df168f4e98e5d3da352ea555883b0be8bbd3 (diff) | |
| download | samba-1598aaca9579f4e2ca9d1fd539693969a2319a4b.tar.gz samba-1598aaca9579f4e2ca9d1fd539693969a2319a4b.tar.bz2 samba-1598aaca9579f4e2ca9d1fd539693969a2319a4b.zip | |
r11676: as tridge uses 0x%llx in his latest commits...
try to use it every where and see how portable it is
metze
(This used to be commit 66a94de5ddd09df858a515555c01aa3d4f7d3e96)
| -rw-r--r-- | source4/librpc/ndr/ndr_basic.c | 10 | ||||
| -rw-r--r-- | source4/torture/rpc/samsync.c | 6 | ||||
| -rw-r--r-- | source4/torture/rpc/spoolss.c | 5 |
3 files changed, 6 insertions, 15 deletions
diff --git a/source4/librpc/ndr/ndr_basic.c b/source4/librpc/ndr/ndr_basic.c index 8f2cf49a1c..d76fa45ec3 100644 --- a/source4/librpc/ndr/ndr_basic.c +++ b/source4/librpc/ndr/ndr_basic.c @@ -649,10 +649,7 @@ void ndr_print_uint32(struct ndr_print *ndr, const char *name, uint32_t v) void ndr_print_udlong(struct ndr_print *ndr, const char *name, uint64_t v) { - ndr->print(ndr, "%-25s: 0x%08x%08x (%llu)", name, - (uint32_t)(v >> 32), - (uint32_t)(v & 0xFFFFFFFF), - v); + ndr->print(ndr, "%-25s: 0x%016llx (%llu)", name, v, v); } void ndr_print_udlongr(struct ndr_print *ndr, const char *name, uint64_t v) @@ -662,10 +659,7 @@ void ndr_print_udlongr(struct ndr_print *ndr, const char *name, uint64_t v) void ndr_print_dlong(struct ndr_print *ndr, const char *name, int64_t v) { - ndr->print(ndr, "%-25s: 0x%08x%08x (%lld)", name, - (uint32_t)(v >> 32), - (uint32_t)(v & 0xFFFFFFFF), - v); + ndr->print(ndr, "%-25s: 0x%016llx (%lld)", name, v, v); } void ndr_print_hyper(struct ndr_print *ndr, const char *name, uint64_t v) diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c index 93bfb71325..79dd8c9833 100644 --- a/source4/torture/rpc/samsync.c +++ b/source4/torture/rpc/samsync.c @@ -210,10 +210,8 @@ static struct sec_desc_buf *samsync_query_lsa_sec_desc(TALLOC_CTX *mem_ctx, #define TEST_UINT64_EQUAL(i1, i2) do {\ if (i1 != i2) {\ - printf("%s: uint64 mismatch: " #i1 ": 0x%08x%08x (%lld) != " #i2 ": 0x%08x%08x (%lld)\n", \ - __location__, \ - (uint32_t)(i1 >> 32), (uint32_t)(i1 & 0xFFFFFFFF), i1, \ - (uint32_t)(i2 >> 32), (uint32_t)(i2 & 0xFFFFFFFF), i2);\ + printf("%s: uint64 mismatch: " #i1 ": 0x%016llx (%lld) != " #i2 ": 0x%016llx (%lld)\n", \ + __location__, i1, i1, i2, i2);\ ret = False;\ } \ } while (0) diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 33e84a5276..76c8673d4f 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -80,9 +80,8 @@ struct test_spoolss_context { #define COMPARE_UINT64(c,r,e) do {\ if (c.e != r.e){\ - printf("%s: " #c "." #e " 0x%08X%08X (%llu) doesn't match " #r "." #e " 0x%08X%08X (%llu)\n",\ - __location__, (uint32_t)(c.e >> 32), (uint32_t)(c.e & 0xFFFFFFFF), c.e,\ - (uint32_t)(r.e >> 32), (uint32_t)(r.e & 0xFFFFFFFF), r.e);\ + printf("%s: " #c "." #e " 0x%016llX (%llu) doesn't match " #r "." #e " 0x%016llX (%llu)\n",\ + __location__, c.e, c.e, r.e, r.e);\ ret = False;\ }\ } while(0) |