FreeCalypso > hg > freecalypso-hwlab
diff simtool/hexread.c @ 150:54e33e9238b6
fc-simtool: harmonize hex string code with fc-uicc-tool
author | Mychaela Falconia <falcon@freecalypso.org> |
---|---|
date | Sun, 07 Feb 2021 00:06:50 +0000 |
parents | 4aaf722ab933 |
children |
line wrap: on
line diff
--- a/simtool/hexread.c Sun Feb 07 00:01:55 2021 +0000 +++ b/simtool/hexread.c Sun Feb 07 00:06:50 2021 +0000 @@ -10,17 +10,6 @@ #include <stdio.h> #include <stdlib.h> -decode_hex_digit(c) -{ - if (c >= '0' && c <= '9') - return(c - '0'); - if (c >= 'A' && c <= 'F') - return(c - 'A' + 10); - if (c >= 'a' && c <= 'f') - return(c - 'a' + 10); - return(-1); -} - read_hex_data_file(filename, databuf) char *filename; u_char *databuf; @@ -65,33 +54,3 @@ } return(count); } - -decode_hex_data_from_string(arg, databuf) - char *arg; - u_char *databuf; -{ - unsigned count; - - for (count = 0; ; count++) { - while (isspace(*arg)) - arg++; - if (!*arg) - break; - if (!isxdigit(arg[0]) || !isxdigit(arg[1])) { - fprintf(stderr, "error: invalid hex string input\n"); - return(-1); - } - if (count >= 255) { - fprintf(stderr, "error: hex input data is too long\n"); - return(-1); - } - databuf[count] = (decode_hex_digit(arg[0]) << 4) | - decode_hex_digit(arg[1]); - arg += 2; - } - if (!count) { - fprintf(stderr, "error: empty hex string argument\n"); - return(-1); - } - return(count); -}