From: Jonathan McDowell Date: Sat, 7 Jun 2008 11:52:41 +0000 (+0100) Subject: Use PRIX64, not PRIx64. X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/commitdiff_plain/e21d57328129d20ebef11143909ebc58bc0affce?ds=inline Use PRIX64, not PRIx64. We do, of course, want capital IDs to match previous behaviour. --- diff --git a/gpgwww.c b/gpgwww.c index 10b3806..24bf490 100644 --- a/gpgwww.c +++ b/gpgwww.c @@ -154,14 +154,14 @@ int main(int argc, char *argv[]) } if (op != OP_GET) { - printf("

Looking for path from 0x%" PRIx64" to 0x%" PRIx64 + printf("

Looking for path from 0x%" PRIX64" to 0x%" PRIX64 ".\n", from, to); - printf("Find reverse path\n", to, from); - printf("" "Get all keys listed

\n", from, @@ -173,8 +173,8 @@ int main(int argc, char *argv[]) catchsignals(); config.dbbackend->initdb(true); inithash(); - logthing(LOGTHING_NOTICE, "Looking for path from 0x%" PRIx64 " to 0x%" - PRIx64, + logthing(LOGTHING_NOTICE, "Looking for path from 0x%" PRIX64 " to 0x%" + PRIX64, from, to); if (op == OP_GET) { diff --git a/keyindex.c b/keyindex.c index e4649ba..c708aa4 100644 --- a/keyindex.c +++ b/keyindex.c @@ -41,22 +41,22 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html) } if (html && uid != NULL) { printf("%s %08" PRIx64 + "search=%016" PRIX64 "\">%08" PRIX64 " " "%s\n", + PRIX64 "\">%s\n", sig, sigid, sigid & 0xFFFFFFFF, sigid, txt2html(uid)); } else if (html && uid == NULL) { - printf("%s %08" PRIx64 " " + printf("%s %08" PRIX64 " " "[User id not found]\n", sig, sigid & 0xFFFFFFFF); } else { - printf("%s %08" PRIx64 + printf("%s %08" PRIX64 " %s\n", sig, sigid & 0xFFFFFFFF, @@ -90,7 +90,7 @@ int list_uids(uint64_t keyid, struct openpgp_signedpacket_list *uids, printf(" "); if (html) { printf("\"[photo" + PRIX64 "&idx=%d\" alt=\"[photo id]\">" "\n", keyid, imgindx); @@ -239,7 +239,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint, if (html) { printf("pub %5d%c/%08" PRIx64 + "search=%016" PRIX64 "\">%08" PRIX64 " %04d/%02d/%02d ", length, (type == 1) ? 'R' : ((type == 16) ? 'g' : @@ -250,7 +250,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint, created->tm_mon + 1, created->tm_mday); } else { - printf("pub %5d%c/%08" PRIx64 " %04d/%02d/%02d ", + printf("pub %5d%c/%08" PRIX64 " %04d/%02d/%02d ", length, (type == 1) ? 'R' : ((type == 16) ? 'g' : ((type == 17) ? 'D' : '?')), @@ -267,7 +267,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint, curuid->packet->data); if (html) { printf("", + "search=0x%016" PRIX64 "\">", keyid); } printf("%s%s%s\n", @@ -332,7 +332,7 @@ int mrkey_index(struct openpgp_publickey *keys) switch (keys->publickey->data[0]) { case 2: case 3: - printf("%016" PRIx64, get_keyid(keys)); + printf("%016" PRIX64, get_keyid(keys)); type = keys->publickey->data[7]; length = (keys->publickey->data[8] << 8) + keys->publickey->data[9]; diff --git a/maxpath.c b/maxpath.c index 4d65588..ccd5008 100644 --- a/maxpath.c +++ b/maxpath.c @@ -53,7 +53,7 @@ void findmaxpath(unsigned long max) to = tmp; distance = to->colour; printf("Current max path (#%ld) is from %" - PRIx64 " to %" PRIx64 + PRIX64 " to %" PRIX64 " (%ld steps)\n", loop, from->keyid, @@ -63,7 +63,7 @@ void findmaxpath(unsigned long max) curkey=curkey->next; } } - printf("Max path is from %" PRIx64 " to %" PRIx64 " (%ld steps)\n", + printf("Max path is from %" PRIX64 " to %" PRIX64 " (%ld steps)\n", from->keyid, to->keyid, distance); diff --git a/sixdegrees.c b/sixdegrees.c index e346cf1..9d2d68d 100644 --- a/sixdegrees.c +++ b/sixdegrees.c @@ -86,12 +86,12 @@ void sixdegrees(uint64_t keyid) config.dbbackend->cached_getkeysigs(keyid); if ((keyinfo = findinhash(keyid)) == NULL) { - printf("Couldn't find key 0x%" PRIx64 ".\n", keyid); + printf("Couldn't find key 0x%" PRIX64 ".\n", keyid); return; } uid = config.dbbackend->keyid2uid(keyinfo->keyid); - printf("Six degrees for 0x%" PRIx64 " (%s):\n", keyinfo->keyid, uid); + printf("Six degrees for 0x%" PRIX64 " (%s):\n", keyinfo->keyid, uid); free(uid); uid = NULL; diff --git a/stats.c b/stats.c index bf85da6..e009de5 100644 --- a/stats.c +++ b/stats.c @@ -139,11 +139,11 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count) (void) config.dbbackend->cached_getkeysigs(fullwant); if ((keyinfoa = findinhash(fullhave)) == NULL) { - printf("Couldn't find key 0x%" PRIx64 ".\n", have); + printf("Couldn't find key 0x%" PRIX64 ".\n", have); return; } if ((keyinfob = findinhash(fullwant)) == NULL) { - printf("Couldn't find key 0x%" PRIx64 ".\n", want); + printf("Couldn't find key 0x%" PRIX64 ".\n", want); return; } @@ -164,8 +164,8 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count) html ? "
" : ""); if (keyinfoa->colour == 0) { if (pathnum == 0) { - printf("Can't find a link from 0x%08" PRIx64 - " to 0x%08" PRIx64 "%s\n", + printf("Can't find a link from 0x%08" PRIX64 + " to 0x%08" PRIX64 "%s\n", have, want, html ? "
" : ""); @@ -175,7 +175,7 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count) } pathnum = count; } else { - printf("%d steps from 0x%08" PRIx64 " to 0x%08" PRIx64 + printf("%d steps from 0x%08" PRIX64 " to 0x%08" PRIX64 "%s\n", keyinfoa->colour, have & 0xFFFFFFFF, want & 0xFFFFFFFF, @@ -186,7 +186,7 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count) curkey->keyid); if (html && uid == NULL) { printf("0x%08" PRIx64 + "0x%08" PRIX64 "\">0x%08" PRIX64 " ([" "User id not found])%s
\n", curkey->keyid & 0xFFFFFFFF, @@ -195,10 +195,10 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count) "" : " signs"); } else if (html && uid != NULL) { printf("0x%08" - PRIx64 "" + "0x%08" PRIX64 "\">0x%08" + PRIX64 "" " (%s)%s" "
\n", curkey->keyid & 0xFFFFFFFF, @@ -208,7 +208,7 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count) (curkey->keyid == fullwant) ? "" : " signs"); } else { - printf("0x%08" PRIx64 " (%s)%s\n", + printf("0x%08" PRIX64 " (%s)%s\n", curkey->keyid & 0xFFFFFFFF, (uid == NULL) ? "[User id not found]" : @@ -232,7 +232,7 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count) } curkey = keyinfoa; while (curkey != NULL && curkey->keyid != 0) { - printf("0x%08" PRIx64 " ", + printf("0x%08" PRIX64 " ", curkey->keyid & 0xFFFFFFFF); curkey = findinhash(curkey->parent); }