X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=stats.c;h=b9692744c2893338927b10146376c4534f5f2a22;hb=4b4592942fc58994cae56118173ad77d55c6f157;hp=a65650854b45f13365b08da95e0c6e4d5b1c8d69;hpb=8e0907be1d73011075a99a0c029c56664e12843e;p=onak.git diff --git a/stats.c b/stats.c index a656508..b969274 100644 --- a/stats.c +++ b/stats.c @@ -13,10 +13,10 @@ * more details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * this program. If not, see . */ +#include #include #include @@ -25,7 +25,6 @@ #include "hash.h" #include "keydb.h" #include "ll.h" -#include "onak-conf.h" #include "stats.h" /** @@ -177,8 +176,8 @@ void dofindpath(struct onak_dbctx *dbctx, 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%016" PRIX64 + " to 0x%016" PRIX64 "%s\n", have, want, html ? "
" : ""); @@ -188,10 +187,10 @@ void dofindpath(struct onak_dbctx *dbctx, } pathnum = count; } else { - printf("%d steps from 0x%08" PRIX64 " to 0x%08" PRIX64 - "%s\n", - keyinfoa->colour, have & 0xFFFFFFFF, - want & 0xFFFFFFFF, + printf("%d steps from 0x%016" PRIX64 " to 0x%016" + PRIX64 "%s\n", + keyinfoa->colour, have, + want, html ? "
" : ""); curkey = keyinfoa; while (curkey != NULL && curkey->keyid != 0) { @@ -199,30 +198,30 @@ void dofindpath(struct onak_dbctx *dbctx, curkey->keyid); if (html && uid == NULL) { printf("0x%08" PRIX64 - " ([" + "0x%016" PRIX64 "\">0x%016" + PRIX64 " ([" "User id not found])%s
\n", - curkey->keyid & 0xFFFFFFFF, - curkey->keyid & 0xFFFFFFFF, + curkey->keyid, + curkey->keyid, (curkey->keyid == fullwant) ? "" : " signs"); } else if (html && uid != NULL) { printf("0x%08" + "0x%016" PRIX64 "\">0x%016" PRIX64 "" " (%s)%s" "
\n", - curkey->keyid & 0xFFFFFFFF, - curkey->keyid & 0xFFFFFFFF, - curkey->keyid & 0xFFFFFFFF, + curkey->keyid, + curkey->keyid, + curkey->keyid, txt2html(uid), (curkey->keyid == fullwant) ? "" : " signs"); } else { - printf("0x%08" PRIX64 " (%s)%s\n", - curkey->keyid & 0xFFFFFFFF, + printf("0x%016" PRIX64 " (%s)%s\n", + curkey->keyid, (uid == NULL) ? "[User id not found]" : uid, @@ -245,8 +244,8 @@ void dofindpath(struct onak_dbctx *dbctx, } curkey = keyinfoa; while (curkey != NULL && curkey->keyid != 0) { - printf("0x%08" PRIX64 " ", - curkey->keyid & 0xFFFFFFFF); + printf("0x%016" PRIX64 " ", + curkey->keyid); curkey = findinhash(curkey->parent); } putchar('\n');