Change to using PRIx64 rather than llX for outputting keyids.

  C99 defines PRIx64 which is set appropriate depending on 32/64 bit,
  so use that rather than llX, which is only ok for 32 bit.

diff --git a/gpgwww.c b/gpgwww.c
index 984aab4cc6d66a2d2c0e630f5ad28077618a593a..10b3806a5e7b1158e7038f86a370faf1140ec13c 100644 (file)
--- a/gpgwww.c
+++ b/gpgwww.c
@@ -154,13 +154,15 @@ int main(int argc, char *argv[])
        }
 
        if (op != OP_GET) {
        }
 
        if (op != OP_GET) {

-               printf("<P>Looking for path from 0x%llX to 0x%llX.\n",
+               printf("<P>Looking for path from 0x%" PRIx64" to 0x%" PRIx64
+                               ".\n",

                                from, to);
                                from, to);

-               printf("<A HREF=\"gpgwww?from=0x%08llX&to=0x%08llX\">"
-                               "Find reverse path</A>\n",
+               printf("<A HREF=\"gpgwww?from=0x%08" PRIx64 "&to=0x%08" PRIx64
+                               "\">Find reverse path</A>\n",

                                to,
                                from);
                                to,
                                from);

-               printf("<A HREF=\"gpgwww?from=0x%08llX&to=0x%08llX&op=get\">"
+               printf("<A HREF=\"gpgwww?from=0x%08" PRIx64 "&to=0x%08" PRIx64
+                               "&op=get\">"

                                "Get all keys listed</A></P>\n",
                                from,
                                to);
                                "Get all keys listed</A></P>\n",
                                from,
                                to);


@@ -171,7 +173,8 @@ int main(int argc, char *argv[])
        catchsignals();
        config.dbbackend->initdb(true);
        inithash();
        catchsignals();
        config.dbbackend->initdb(true);
        inithash();

-       logthing(LOGTHING_NOTICE, "Looking for path from 0x%llX to 0x%llX.",
+       logthing(LOGTHING_NOTICE, "Looking for path from 0x%" PRIx64 " to 0x%"
+                       PRIx64,

                        from,
                        to);
        if (op == OP_GET) {
                        from,
                        to);
        if (op == OP_GET) {

diff --git a/keyindex.c b/keyindex.c
index a4cc90b78710fb4ee417d30352df0e62407a9adf..e4649ba041fd0ed2f914a06189224ac143456264 100644 (file)
--- 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&"
                }
                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) {
                                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 {
                                "[User id not found]\n",
                                sig,
                                sigid & 0xFFFFFFFF);
                } else {

-                       printf("%s         %08llX"
+                       printf("%s         %08" PRIx64

                                "             %s\n",
                                sig,
                                sigid & 0xFFFFFFFF,
                                "             %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) {
                } 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");
                                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&"
 
                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' : '?')),
                                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 {
                                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' : '?')),
                                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&"
                                curuid->packet->data);
                        if (html) {
                                printf("<a href=\"lookup?op=vindex&"

-                                       "search=0x%016llX\">",
+                                       "search=0x%016" PRIx64 "\">",

                                        keyid);
                        }
                        printf("%s%s%s\n", 
                                        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:
                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];
                        type = keys->publickey->data[7];
                        length = (keys->publickey->data[8] << 8) +
                                        keys->publickey->data[9];

diff --git a/maxpath.c b/maxpath.c
index b9ba53a14b036b7b7a32cc0a3edc7b90e55c364c..4d65588636e5a68fe03e43f4dbd55668e4e00963 100644 (file)
--- a/maxpath.c
+++ b/maxpath.c
@@ -52,8 +52,9 @@ void findmaxpath(unsigned long max)
                                from = (struct stats_key *)curkey->object;
                                to = tmp;
                                distance = to->colour;
                                from = (struct stats_key *)curkey->object;
                                to = tmp;
                                distance = to->colour;

-                               printf("Current max path (#%ld) is from %llX"
-                                               " to %llX (%ld steps)\n", 
+                               printf("Current max path (#%ld) is from %"
+                                               PRIx64 " to %" PRIx64 
+                                               " (%ld steps)\n", 

                                                loop,
                                                from->keyid,
                                                to->keyid,
                                                loop,
                                                from->keyid,
                                                to->keyid,


@@ -62,7 +63,7 @@ void findmaxpath(unsigned long max)
                        curkey=curkey->next;
                }
        }
                        curkey=curkey->next;
                }
        }

-       printf("Max path is from %llX to %llX (%ld steps)\n",
+       printf("Max path is from %" PRIx64 " to %" PRIx64 " (%ld steps)\n",

                        from->keyid,
                        to->keyid,
                        distance);
                        from->keyid,
                        to->keyid,
                        distance);

diff --git a/parsekey.c b/parsekey.c
index 6e080af36dc66493b0208e9d77c93a705a9e8bfc..a0c0311aec1e98fa1fb0294d92562f7055958a62 100644 (file)
--- a/parsekey.c
+++ b/parsekey.c
@@ -148,7 +148,7 @@ int parse_keys(struct openpgp_packet_list *packets,
  */
 int debug_packet(struct openpgp_packet *packet)
 {
  */
 int debug_packet(struct openpgp_packet *packet)
 {

-       printf("\tNew format: %d, Tag: %u, Length: %d\n",
+       printf("\tNew format: %d, Tag: %u, Length: %zd\n",

                        packet->newformat,
                        packet->tag,
                        packet->length);
                        packet->newformat,
                        packet->tag,
                        packet->length);

diff --git a/sixdegrees.c b/sixdegrees.c
index d4e55c180cb654877a8a9888e3364b7cd9be3d11..e346cf131a6cd56b864b47e6fdf10bdac1b73f08 100644 (file)
--- 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) {
        config.dbbackend->cached_getkeysigs(keyid);
 
        if ((keyinfo = findinhash(keyid)) == NULL) {

-               printf("Couldn't find key 0x%llX.\n", keyid);
+               printf("Couldn't find key 0x%" PRIx64 ".\n", keyid);

                return;
        }
 
        uid = config.dbbackend->keyid2uid(keyinfo->keyid);
                return;
        }
 
        uid = config.dbbackend->keyid2uid(keyinfo->keyid);

-       printf("Six degrees for 0x%llX (%s):\n", keyinfo->keyid, uid);
+       printf("Six degrees for 0x%" PRIx64 " (%s):\n", keyinfo->keyid, uid);

        free(uid);
        uid = NULL;
 
        free(uid);
        uid = NULL;
 

diff --git a/stats.c b/stats.c
index ca7c929d73e29b0b357f6410a2917ad5718b22f3..bf85da6653c6b32ce630d7b748292bef2d35b16d 100644 (file)
--- 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) {
        (void) config.dbbackend->cached_getkeysigs(fullwant);
 
        if ((keyinfoa = findinhash(fullhave)) == NULL) {

-               printf("Couldn't find key 0x%llX.\n", have);
+               printf("Couldn't find key 0x%" PRIx64 ".\n", have);

                return;
        }
        if ((keyinfob = findinhash(fullwant)) == NULL) {
                return;
        }
        if ((keyinfob = findinhash(fullwant)) == NULL) {

-               printf("Couldn't find key 0x%llX.\n", want);
+               printf("Couldn't find key 0x%" PRIx64 ".\n", want);

                return;
        }
 
                return;
        }
 


@@ -164,8 +164,8 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
                        html ? "<BR>" : "");
                if (keyinfoa->colour == 0) {
                        if (pathnum == 0) {
                        html ? "<BR>" : "");
                if (keyinfoa->colour == 0) {
                        if (pathnum == 0) {

-                               printf("Can't find a link from 0x%08llX to "
-                               "0x%08llX%s\n",
+                               printf("Can't find a link from 0x%08" PRIx64
+                               " to 0x%08" PRIx64 "%s\n",

                                have,
                                want,
                                html ? "<BR>" : "");
                                have,
                                want,
                                html ? "<BR>" : "");


@@ -175,7 +175,8 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
                        }
                        pathnum = count;
                } else {
                        }
                        pathnum = count;
                } else {

-                       printf("%d steps from 0x%08llX to 0x%08llX%s\n",
+                       printf("%d steps from 0x%08" PRIx64 " to 0x%08" PRIx64
+                               "%s\n",

                                keyinfoa->colour, have & 0xFFFFFFFF,
                                want & 0xFFFFFFFF,
                                html ? "<BR>" : "");
                                keyinfoa->colour, have & 0xFFFFFFFF,
                                want & 0xFFFFFFFF,
                                html ? "<BR>" : "");


@@ -185,7 +186,8 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
                                                curkey->keyid);
                                if (html && uid == NULL) {
                                        printf("<a href=\"lookup?op=get&search="
                                                curkey->keyid);
                                if (html && uid == NULL) {
                                        printf("<a href=\"lookup?op=get&search="

-                                               "0x%08llX\">0x%08llX</a> (["
+                                               "0x%08" PRIx64 "\">0x%08" PRIx64
+                                               "</a> (["

                                                "User id not found])%s<BR>\n",
                                                curkey->keyid & 0xFFFFFFFF,
                                                curkey->keyid & 0xFFFFFFFF,
                                                "User id not found])%s<BR>\n",
                                                curkey->keyid & 0xFFFFFFFF,
                                                curkey->keyid & 0xFFFFFFFF,


@@ -193,9 +195,11 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
                                                        "" : " signs");
                                } else if (html && uid != NULL) {
                                        printf("<a href=\"lookup?op=get&search="
                                                        "" : " signs");
                                } else if (html && uid != NULL) {
                                        printf("<a href=\"lookup?op=get&search="

-                                               "0x%08llX\">0x%08llX</a>"
+                                               "0x%08" PRIx64 "\">0x%08"
+                                               PRIx64 "</a>"

                                                " (<a href=\"lookup?op=vindex&"
                                                " (<a href=\"lookup?op=vindex&"

-                                               "search=0x%08llX\">%s</a>)%s"
+                                               "search=0x%08" PRIx64 
+                                               "\">%s</a>)%s"

                                                "<BR>\n",
                                                curkey->keyid & 0xFFFFFFFF,
                                                curkey->keyid & 0xFFFFFFFF,
                                                "<BR>\n",
                                                curkey->keyid & 0xFFFFFFFF,
                                                curkey->keyid & 0xFFFFFFFF,


@@ -204,7 +208,7 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
                                                (curkey->keyid == fullwant) ?
                                                "" : " signs");
                                } else {
                                                (curkey->keyid == fullwant) ?
                                                "" : " signs");
                                } else {

-                                       printf("0x%08llX (%s)%s\n",
+                                       printf("0x%08" PRIx64 " (%s)%s\n",

                                                curkey->keyid & 0xFFFFFFFF,
                                                (uid == NULL) ?
                                                        "[User id not found]" :
                                                curkey->keyid & 0xFFFFFFFF,
                                                (uid == NULL) ?
                                                        "[User id not found]" :


@@ -228,7 +232,8 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
                        }
                        curkey = keyinfoa;
                        while (curkey != NULL && curkey->keyid != 0) {
                        }
                        curkey = keyinfoa;
                        while (curkey != NULL && curkey->keyid != 0) {

-                               printf("0x%08llX ", curkey->keyid & 0xFFFFFFFF);
+                               printf("0x%08" PRIx64 " ",
+                                               curkey->keyid & 0xFFFFFFFF);

                                curkey = findinhash(curkey->parent);
                        }
                        putchar('\n');
                                curkey = findinhash(curkey->parent);
                        }
                        putchar('\n');