Merge pull request #550 from pwpiwi/fix_warnings

[proxmark3-svn] / client / reveng / model.c

diff --git a/client/reveng/model.c b/client/reveng/model.c
index 85999b2759cef73c7d146135b17ae5173863448a..5a9b6580449dd20a7343f1e1e1c3e52ee4e28996 100644 (file)
--- a/client/reveng/model.c
+++ b/client/reveng/model.c
@@ -374,7 +374,7 @@ static const struct mpreset models[] = {
        { 6UL, b32+ 52, 0,       P_LE,   0,       b32+ 72, "CRC-6/DARC"        },       /* 44 */
        {11UL, b32+ 56, b32+  6, P_BE,   0,       b32+ 84, "CRC-11"            },       /* 45 */
        {16UL, b32+ 60, 0,       P_BE,   0,       b32+122, "CRC-16/BUYPASS"    },       /* 46 */
        { 6UL, b32+ 52, 0,       P_LE,   0,       b32+ 72, "CRC-6/DARC"        },       /* 44 */
        {11UL, b32+ 56, b32+  6, P_BE,   0,       b32+ 84, "CRC-11"            },       /* 45 */
        {16UL, b32+ 60, 0,       P_BE,   0,       b32+122, "CRC-16/BUYPASS"    },       /* 46 */

-       {16UL, b32+ 60, 0,       P_LE,   0,       b32+ 87, "CRC-16"            },       /* 47 */
+       {16UL, b32+ 60, 0,       P_LE,   0,       b32+ 87, "ARC"               },       /* 47 */

        {16UL, b32+ 60, 0,       P_LE,   b32+126, b32+ 43, "CRC-16/MAXIM"      },       /* 48 */
        {16UL, b32+ 60, b32+ 61, P_BE,   0,       b32+ 76, "CRC-16/DDS-110"    },       /* 49 */
        {16UL, b32+ 60, b32+126, P_LE,   0,       b32+ 46, "MODBUS"            },       /* 50 */
        {16UL, b32+ 60, 0,       P_LE,   b32+126, b32+ 43, "CRC-16/MAXIM"      },       /* 48 */
        {16UL, b32+ 60, b32+ 61, P_BE,   0,       b32+ 76, "CRC-16/DDS-110"    },       /* 49 */
        {16UL, b32+ 60, b32+126, P_LE,   0,       b32+ 46, "MODBUS"            },       /* 50 */


@@ -596,7 +596,7 @@ mbynam(model_t *dest, const char *key) {
                uerror("cannot allocate memory for comparison string");
        akey.name = uptr = ukey;
        do
                uerror("cannot allocate memory for comparison string");
        akey.name = uptr = ukey;
        do

-               *uptr++ = toupper(*key);
+               *uptr++ = toupper((unsigned char)*key);

        while(*key++);
 
        aptr = bsearch(&akey, aliases, NALIASES, sizeof(struct malias), (int (*)(const void *, const void *)) &acmp);
        while(*key++);
 
        aptr = bsearch(&akey, aliases, NALIASES, sizeof(struct malias), (int (*)(const void *, const void *)) &acmp);