Merge pull request #969 from pwpiwi/gcc10_fixes

[proxmark3-svn] / client / fido / cbortools.c

diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index 4674afc9a55d606ae5f73417c30b3c9056cc3236..6cddabfabf24eb29664a50ee91ffb06b76f50b2a 100644 (file)
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -40,7 +40,7 @@ static CborError dumpelm(CborValue *it, bool *got_next, int nestingLevel) {
        case CborIntegerType: {
                int64_t val;
                cbor_value_get_int64(it, &val);     // can't fail
        case CborIntegerType: {
                int64_t val;
                cbor_value_get_int64(it, &val);     // can't fail

-               printf("%lld", (long long)val);
+               printf("%" PRIi64, val);

                break;
        }
 
                break;
        }
 


@@ -71,7 +71,7 @@ static CborError dumpelm(CborValue *it, bool *got_next, int nestingLevel) {
        case CborTagType: {
                CborTag tag;
                cbor_value_get_tag(it, &tag);     
        case CborTagType: {
                CborTag tag;
                cbor_value_get_tag(it, &tag);     

-               printf("Tag(%lld)", (long long)tag);
+               printf("Tag(%" PRIu64, tag);

                break;
        }
 
                break;
        }
 


@@ -206,13 +206,7 @@ int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, si
     CborError err = dumprecursive(cmdCode, isResponse, &cb, false, 0);
 
        if (err) {
     CborError err = dumprecursive(cmdCode, isResponse, &cb, false, 0);
 
        if (err) {

-               fprintf(stderr,
-#if __WORDSIZE == 64           
-               "CBOR parsing failure at offset %" PRId64 " : %s\n",
-#else
-               "CBOR parsing failure at offset %" PRId32 " : %s\n",    
-#endif
-               cb.ptr - data, cbor_error_string(err));
+               fprintf(stderr, "CBOR parsing failure at offset %td : %s\n", cb.ptr - data, cbor_error_string(err));

                return 1;
        }       
        
                return 1;
        }