Remove unused functions le32toh, le24toh, hextobinstring, binarraytobinstring, print_...

* Remove unused method le32toh.
* Delete unused function le24toh
* Remove unused functions hextobinstring, binarraytobinstring
* Remove unused functions print_hex, print_hex_break
* Delete unused functions sprint_hex_ascii, sprint_ascii
* Remove unused function SwapEndian64ex

diff --git a/armsrc/util.c b/armsrc/util.c
index 8a8d66576d4172e2611bf5d156bb340ce4087c58..a1b0f1518b98e417d6c07217412bf2a746e54dc5 100644 (file)
--- a/armsrc/util.c
+++ b/armsrc/util.c
@@ -81,11 +81,6 @@ void lsl (uint8_t *data, size_t len) {
     data[len - 1] <<= 1;
 }
 
     data[len - 1] <<= 1;
 }
 

-int32_t le24toh (uint8_t data[3])
-{
-    return (data[2] << 16) | (data[1] << 8) | data[0];
-}
-

 void LEDsoff()
 {
        LED_A_OFF();
 void LEDsoff()
 {
        LED_A_OFF();

diff --git a/armsrc/util.h b/armsrc/util.h
index 58dcdd522a80d727a5df6c80b674820aca7195aa..fb50ecc86e0ea91b031d354869af5741e46de50d 100644 (file)
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -34,7 +34,6 @@ void num_to_bytes(uint64_t n, size_t len, uint8_t* dest);
 uint64_t bytes_to_num(uint8_t* src, size_t len);
 void rol(uint8_t *data, const size_t len);
 void lsl (uint8_t *data, size_t len);
 uint64_t bytes_to_num(uint8_t* src, size_t len);
 void rol(uint8_t *data, const size_t len);
 void lsl (uint8_t *data, size_t len);

-int32_t le24toh (uint8_t data[3]);

 
 void LED(int led, int ms);
 void LEDsoff();
 
 void LED(int led, int ms);
 void LEDsoff();

diff --git a/client/util.c b/client/util.c
index 2be1e46b6fa4a03bc3c1bb170e1e7e579f349bc7..d7c824d9c85505599b08067265a6723605996187 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -138,33 +138,6 @@ void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex
 
 // printing and converting functions
 
 
 // printing and converting functions
 

-void print_hex(const uint8_t * data, const size_t len)
-{
-       size_t i;
-
-       for (i=0; i < len; i++)
-               printf("%02x ", data[i]);
-
-       printf("\n");
-}
-
-void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks) {
-
-       int rownum = 0;
-       printf("[%02d] | ", rownum);
-       for (int i = 0; i < len; ++i) {
-
-               printf("%02X ", data[i]);
-               
-               // check if a line break is needed
-               if ( breaks > 0 && !((i+1) % breaks) && (i+1 < len) ) {
-                       ++rownum;
-                       printf("\n[%02d] | ", rownum);
-               }
-       }
-       printf("\n");
-}
-

 char *sprint_hex(const uint8_t *data, const size_t len) {
        static char buf[1025] = {0};
        
 char *sprint_hex(const uint8_t *data, const size_t len) {
        static char buf[1025] = {0};
        


@@ -220,27 +193,6 @@ char *sprint_bin(const uint8_t *data, const size_t len) {
        return sprint_bin_break(data, len, 0);
 }
 
        return sprint_bin_break(data, len, 0);
 }
 

-char *sprint_hex_ascii(const uint8_t *data, const size_t len) {
-       static char buf[1024];
-       char *tmp = buf;
-       memset(buf, 0x00, 1024);
-       size_t max_len = (len > 255) ? 255 : len;
-       // max 255 bytes * 3 + 2 characters = 767 in buffer
-       sprintf(tmp, "%.765s| ", sprint_hex(data, max_len) );
-       
-       size_t i = 0;
-       size_t pos = (max_len * 3)+2;
-       // add another 255 characters ascii = 1020 characters of buffer used
-       while(i < max_len) {
-               char c = data[i];
-               if ( (c < 32) || (c == 127))
-                       c = '.';
-               sprintf(tmp+pos+i, "%c",  c);
-               ++i;
-       }
-       return buf;
-}
-

 char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_str_len) {
        static char buf[1024];
        char *tmp = buf;
 char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_str_len) {
        static char buf[1024];
        char *tmp = buf;


@@ -260,10 +212,6 @@ char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_st
        return buf;
 }
 
        return buf;
 }
 

-char *sprint_ascii(const uint8_t *data, const size_t len) {
-       return sprint_ascii_ex(data, len, 0);
-}
-

 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest)
 {
        while (len--) {
 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest)
 {
        while (len--) {


@@ -324,16 +272,6 @@ uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockS
        return tmp;
 }
 
        return tmp;
 }
 

-// takes a uint8_t src array, for len items and reverses the byte order in blocksizes (8,16,32,64), 
-// returns: the dest array contains the reordered src array.
-void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest){
-       for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){
-               for (size_t i = 0; i < blockSize; i++){
-                       dest[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];
-               }
-       }
-}
-

 //assumes little endian
 char * printBits(size_t const size, void const * const ptr)
 {
 //assumes little endian
 char * printBits(size_t const size, void const * const ptr)
 {


@@ -648,17 +586,6 @@ int hextobinarray(char *target, char *source)
     return count;
 }
 
     return count;
 }
 

-// convert hex to human readable binary string
-int hextobinstring(char *target, char *source)
-{
-    int length;
-
-    if(!(length= hextobinarray(target, source)))
-        return 0;
-    binarraytobinstring(target, target, length);
-    return length;
-}
-

 // convert binary array of 0x00/0x01 values to hex (safe to do in place as target will always be shorter than source)
 // return number of bits converted
 int binarraytohex(char *target,char *source, int length)
 // convert binary array of 0x00/0x01 values to hex (safe to do in place as target will always be shorter than source)
 // return number of bits converted
 int binarraytohex(char *target,char *source, int length)


@@ -681,16 +608,6 @@ int binarraytohex(char *target,char *source, int length)
     return length;
 }
 
     return length;
 }
 

-// convert binary array to human readable binary
-void binarraytobinstring(char *target, char *source,  int length)
-{
-    int i;
-
-    for(i= 0 ; i < length ; ++i)
-        *(target++)= *(source++) + '0';
-    *target= '\0';
-}
-

 // return parity bit required to match type
 uint8_t GetParity( uint8_t *bits, uint8_t type, int length)
 {
 // return parity bit required to match type
 uint8_t GetParity( uint8_t *bits, uint8_t type, int length)
 {


@@ -718,13 +635,6 @@ void xor(unsigned char *dst, unsigned char *src, size_t len) {
        *dst ^= *src;
 }
 
        *dst ^= *src;
 }
 

-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
 void rol(uint8_t *data, const size_t len){
 // RotateLeft - Ultralight, Desfire, works on byte level
 // 00-01-02  >> 01-02-00
 void rol(uint8_t *data, const size_t len){

diff --git a/client/util.h b/client/util.h
index 878938f46678593368414ade87518292355ac5b4..31ad29fbf7903e6ed406a671f817e0c423e22615 100644 (file)
--- a/client/util.h
+++ b/client/util.h
@@ -46,14 +46,11 @@ extern void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byte
 extern void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len, 
        const size_t hex_max_len, const size_t min_str_len, const size_t spaces_between, bool uppercase);
 
 extern void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len, 
        const size_t hex_max_len, const size_t min_str_len, const size_t spaces_between, bool uppercase);
 

-extern void print_hex(const uint8_t * data, const size_t len);

 extern char *sprint_hex(const uint8_t * data, const size_t len);
 extern char *sprint_hex_inrow(const uint8_t *data, const size_t len);
 extern char *sprint_hex_inrow_ex(const uint8_t *data, const size_t len, const size_t min_str_len);
 extern char *sprint_bin(const uint8_t * data, const size_t len);
 extern char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks);
 extern char *sprint_hex(const uint8_t * data, const size_t len);
 extern char *sprint_hex_inrow(const uint8_t *data, const size_t len);
 extern char *sprint_hex_inrow_ex(const uint8_t *data, const size_t len, const size_t min_str_len);
 extern char *sprint_bin(const uint8_t * data, const size_t len);
 extern char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks);

-extern char *sprint_hex_ascii(const uint8_t *data, const size_t len);
-extern char *sprint_ascii(const uint8_t *data, const size_t len);

 extern char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_str_len);
 
 extern void num_to_bytes(uint64_t n, size_t len, uint8_t* dest);
 extern char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_str_len);
 
 extern void num_to_bytes(uint64_t n, size_t len, uint8_t* dest);


@@ -64,7 +61,6 @@ extern char *printBits(size_t const size, void const * const ptr);
 extern char * printBitsPar(const uint8_t *b, size_t len);
 extern uint32_t SwapBits(uint32_t value, int nrbits);
 extern uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize);
 extern char * printBitsPar(const uint8_t *b, size_t len);
 extern uint32_t SwapBits(uint32_t value, int nrbits);
 extern uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize);

-extern void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest);

 
 extern int param_getlength(const char *line, int paramnum);
 extern char param_getchar(const char *line, int paramnum);
 
 extern int param_getlength(const char *line, int paramnum);
 extern char param_getchar(const char *line, int paramnum);


@@ -82,15 +78,11 @@ extern int param_gethex_to_eol(const char *line, int paramnum, uint8_t * data, i
 extern int param_getstr(const char *line, int paramnum, char * str, size_t buffersize);
 
 extern int hextobinarray( char *target,  char *source);
 extern int param_getstr(const char *line, int paramnum, char * str, size_t buffersize);
 
 extern int hextobinarray( char *target,  char *source);

-extern int hextobinstring( char *target,  char *source);

 extern int binarraytohex( char *target,  char *source,  int length);
 extern int binarraytohex( char *target,  char *source,  int length);

-extern void binarraytobinstring(char *target,  char *source,  int length);

 extern uint8_t GetParity( uint8_t *string, uint8_t type,  int length);
 extern void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length);
 
 extern void xor(unsigned char *dst, unsigned char *src, size_t len);
 extern uint8_t GetParity( uint8_t *string, uint8_t type,  int length);
 extern void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length);
 
 extern void xor(unsigned char *dst, unsigned char *src, size_t len);

-extern int32_t le24toh(uint8_t data[3]);
-extern uint32_t le32toh (uint8_t *data);

 extern void rol(uint8_t *data, const size_t len);
 
 extern void clean_ascii(unsigned char *buf, size_t len);
 extern void rol(uint8_t *data, const size_t len);
 
 extern void clean_ascii(unsigned char *buf, size_t len);