X-Git-Url: http://the.earth.li/gitweb/?p=onak.git;a=blobdiff_plain;f=keyindex.c;h=e4649ba041fd0ed2f914a06189224ac143456264;hp=a4cc90b78710fb4ee417d30352df0e62407a9adf;hb=1921fa44cfae203ae40e853ee9ecedb206fa9413;hpb=78808f320d39f8c22622feb613706325222cfd59

diff --git a/keyindex.c b/keyindex.c
index a4cc90b..e4649ba 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -41,21 +41,22 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html)
 		}
 		if (html && uid != NULL) {
 			printf("%s         <a href=\"lookup?op=get&"
-				"search=%016llX\">%08llX</a>             "
-				"<a href=\"lookup?op=vindex&search=0x%016llX\">"
-				"%s</a>\n",
+				"search=%016" PRIx64 "\">%08" PRIx64
+				"</a>             "
+				"<a href=\"lookup?op=vindex&search=0x%016"
+				PRIx64 "\">%s</a>\n",
 				sig,
 				sigid,
 				sigid & 0xFFFFFFFF,
 				sigid,
 				txt2html(uid));
 		} else if (html && uid == NULL) {
-			printf("%s         %08llX             "
+			printf("%s         %08" PRIx64 "             "
 				"[User id not found]\n",
 				sig,
 				sigid & 0xFFFFFFFF);
 		} else {
-			printf("%s         %08llX"
+			printf("%s         %08" PRIx64
 				"             %s\n",
 				sig,
 				sigid & 0xFFFFFFFF,
@@ -88,9 +89,11 @@ int list_uids(uint64_t keyid, struct openpgp_signedpacket_list *uids,
 		} else if (uids->packet->tag == 17) {
 			printf("                                ");
 			if (html) {
-				printf("<img src=\"lookup?op=photo&search=0x%llX&idx=%d\" alt=\"[photo id]\">\n",
-						keyid,
-						imgindx);
+				printf("<img src=\"lookup?op=photo&search=0x%"
+					PRIx64 "&idx=%d\" alt=\"[photo id]\">"
+					"\n",
+					keyid,
+					imgindx);
 				imgindx++;
 			} else {
 				printf("[photo id]\n");
@@ -236,7 +239,8 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 
 		if (html) {
 			printf("pub  %5d%c/<a href=\"lookup?op=get&"
-				"search=%016llX\">%08llX</a> %04d/%02d/%02d ",
+				"search=%016" PRIx64 "\">%08" PRIx64
+				"</a> %04d/%02d/%02d ",
 				length,
 				(type == 1) ? 'R' : ((type == 16) ? 'g' : 
 					((type == 17) ? 'D' : '?')),
@@ -246,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/%08llX %04d/%02d/%02d ",
+			printf("pub  %5d%c/%08" PRIx64 " %04d/%02d/%02d ",
 				length,
 				(type == 1) ? 'R' : ((type == 16) ? 'g' : 
 					((type == 17) ? 'D' : '?')),
@@ -263,7 +267,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 				curuid->packet->data);
 			if (html) {
 				printf("<a href=\"lookup?op=vindex&"
-					"search=0x%016llX\">",
+					"search=0x%016" PRIx64 "\">",
 					keyid);
 			}
 			printf("%s%s%s\n", 
@@ -328,7 +332,7 @@ int mrkey_index(struct openpgp_publickey *keys)
 		switch (keys->publickey->data[0]) {
 		case 2:
 		case 3:
-			printf("%016llX", get_keyid(keys));
+			printf("%016" PRIx64, get_keyid(keys));
 			type = keys->publickey->data[7];
 			length = (keys->publickey->data[8] << 8) +
 					keys->publickey->data[9];