1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00

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 66a94de5dd)
This commit is contained in:
Stefan Metzmacher 2005-11-11 10:49:55 +00:00 committed by Gerald (Jerry) Carter
parent 7935df168f
commit 1598aaca95
3 changed files with 6 additions and 15 deletions

View File

@ -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)

View File

@ -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)

View File

@ -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)