|
69 | 69 | #if defined(_MSC_VER)
|
70 | 70 | #include <direct.h>
|
71 | 71 | #include <io.h>
|
72 |
| -#define strcasecmp _stricmp |
73 | 72 | #define getpid GetCurrentProcessId
|
74 | 73 | #define umask _umask
|
75 | 74 | typedef int mode_t;
|
@@ -1350,35 +1349,35 @@ enum encoding ParseEncoding(const char* encoding,
|
1350 | 1349 | break;
|
1351 | 1350 | }
|
1352 | 1351 |
|
1353 |
| - if (strcasecmp(encoding, "utf8") == 0) { |
| 1352 | + if (StringEqualNoCase(encoding, "utf8")) { |
1354 | 1353 | return UTF8;
|
1355 |
| - } else if (strcasecmp(encoding, "utf-8") == 0) { |
| 1354 | + } else if (StringEqualNoCase(encoding, "utf-8")) { |
1356 | 1355 | return UTF8;
|
1357 |
| - } else if (strcasecmp(encoding, "ascii") == 0) { |
| 1356 | + } else if (StringEqualNoCase(encoding, "ascii")) { |
1358 | 1357 | return ASCII;
|
1359 |
| - } else if (strcasecmp(encoding, "base64") == 0) { |
| 1358 | + } else if (StringEqualNoCase(encoding, "base64")) { |
1360 | 1359 | return BASE64;
|
1361 |
| - } else if (strcasecmp(encoding, "ucs2") == 0) { |
| 1360 | + } else if (StringEqualNoCase(encoding, "ucs2")) { |
1362 | 1361 | return UCS2;
|
1363 |
| - } else if (strcasecmp(encoding, "ucs-2") == 0) { |
| 1362 | + } else if (StringEqualNoCase(encoding, "ucs-2")) { |
1364 | 1363 | return UCS2;
|
1365 |
| - } else if (strcasecmp(encoding, "utf16le") == 0) { |
| 1364 | + } else if (StringEqualNoCase(encoding, "utf16le")) { |
1366 | 1365 | return UCS2;
|
1367 |
| - } else if (strcasecmp(encoding, "utf-16le") == 0) { |
| 1366 | + } else if (StringEqualNoCase(encoding, "utf-16le")) { |
1368 | 1367 | return UCS2;
|
1369 |
| - } else if (strcasecmp(encoding, "binary") == 0) { |
| 1368 | + } else if (StringEqualNoCase(encoding, "binary")) { |
1370 | 1369 | return BINARY;
|
1371 |
| - } else if (strcasecmp(encoding, "buffer") == 0) { |
| 1370 | + } else if (StringEqualNoCase(encoding, "buffer")) { |
1372 | 1371 | return BUFFER;
|
1373 |
| - } else if (strcasecmp(encoding, "hex") == 0) { |
| 1372 | + } else if (StringEqualNoCase(encoding, "hex")) { |
1374 | 1373 | return HEX;
|
1375 |
| - } else if (strcasecmp(encoding, "raw") == 0) { |
| 1374 | + } else if (StringEqualNoCase(encoding, "raw") == 0) { |
1376 | 1375 | if (!no_deprecation) {
|
1377 | 1376 | fprintf(stderr, "'raw' (array of integers) has been removed. "
|
1378 | 1377 | "Use 'binary'.\n");
|
1379 | 1378 | }
|
1380 | 1379 | return BINARY;
|
1381 |
| - } else if (strcasecmp(encoding, "raws") == 0) { |
| 1380 | + } else if (StringEqualNoCase(encoding, "raws") == 0) { |
1382 | 1381 | if (!no_deprecation) {
|
1383 | 1382 | fprintf(stderr, "'raws' encoding has been renamed to 'binary'. "
|
1384 | 1383 | "Please update your code.\n");
|
|
0 commit comments