Do not treat gcc's "misleading-indentation" warning as error (fixes #187).

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index c4f7d200f61bb096949c2e5939c9c48349da7431..e4add6c09e0112390ce332f2d7052ea56899973c 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -23,7 +23,7 @@ int ukbhit(void)
   static struct termios Otty, Ntty;
 
 
   static struct termios Otty, Ntty;
 
 

-  tcgetattr( 0, &Otty);
+  if ( tcgetattr( 0, &Otty) == -1 ) return -1;

   Ntty = Otty;
 
   Ntty.c_iflag          = 0;       /* input mode                */
   Ntty = Otty;
 
   Ntty.c_iflag          = 0;       /* input mode                */


@@ -94,7 +94,7 @@ void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byteCount)
        memset(fileName, 0x00, 200);
        
        for (int j = 0; j < byteCount; j++, fnameptr += 2)
        memset(fileName, 0x00, 200);
        
        for (int j = 0; j < byteCount; j++, fnameptr += 2)

-               sprintf(fnameptr, "%02x", uid[j]); 
+               sprintf(fnameptr, "%02x", (unsigned int) uid[j]); 

        sprintf(fnameptr, "%s", ext); 
 }
 
        sprintf(fnameptr, "%s", ext); 
 }
 


@@ -119,7 +119,7 @@ char *sprint_hex(const uint8_t *data, const size_t len) {
        size_t i;
 
        for (i=0; i < maxLen; ++i, tmp += 3)
        size_t i;
 
        for (i=0; i < maxLen; ++i, tmp += 3)

-               sprintf(tmp, "%02x ", data[i]);
+               sprintf(tmp, "%02x ", (unsigned int) data[i]);

 
        return buf;
 }
 
        return buf;
 }


@@ -140,8 +140,9 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
        size_t in_index = 0;
        // loop through the out_index to make sure we don't go too far
        for (size_t out_index=0; out_index < max_len; out_index++) {
        size_t in_index = 0;
        // loop through the out_index to make sure we don't go too far
        for (size_t out_index=0; out_index < max_len; out_index++) {

-               // set character
-               sprintf(tmp++, "%u", data[in_index]);
+               // set character - (should be binary but verify it isn't more than 1 digit)
+               if (data[in_index]<10)
+                       sprintf(tmp++, "%u", (unsigned int) data[in_index]);

                // check if a line break is needed and we have room to print it in our array
                if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 != max_len) ) {
                        // increment and print line break
                // check if a line break is needed and we have room to print it in our array
                if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 != max_len) ) {
                        // increment and print line break


@@ -214,7 +215,7 @@ char * printBits(size_t const size, void const * const ptr)
         {
             byte = b[i] & (1<<j);
             byte >>= j;
         {
             byte = b[i] & (1<<j);
             byte >>= j;

-            sprintf(tmp, "%u", byte);
+            sprintf(tmp, "%u", (unsigned int)byte);

                        tmp++;
         }
     }
                        tmp++;
         }
     }


@@ -450,7 +451,7 @@ int binarraytohex(char *target,char *source, int length)
     {
         for(i= x= 0 ; i < 4 ; ++i)
             x +=  ( source[i] << (3 - i));
     {
         for(i= x= 0 ; i < 4 ; ++i)
             x +=  ( source[i] << (3 - i));

-        sprintf(target,"%X", x);
+        sprintf(target,"%X", (unsigned int)x);

         ++target;
         source += 4;
         j -= 4;
         ++target;
         source += 4;
         j -= 4;


@@ -497,6 +498,9 @@ void xor(unsigned char *dst, unsigned char *src, size_t len) {
 int32_t le24toh (uint8_t data[3]) {
     return (data[2] << 16) | (data[1] << 8) | data[0];
 }
 int32_t le24toh (uint8_t data[3]) {
     return (data[2] << 16) | (data[1] << 8) | data[0];
 }

+uint32_t le32toh (uint8_t *data) {
+       return (uint32_t)( (data[3]<<24) | (data[2]<<16) | (data[1]<<8) | data[0]);
+}

 
 // RotateLeft - Ultralight, Desfire, works on byte level
 // 00-01-02  >> 01-02-00
 
 // RotateLeft - Ultralight, Desfire, works on byte level
 // 00-01-02  >> 01-02-00