forget it, use _CRT_SECURE_NO_WARNINGS

Author: SombrAbsol

ra2mes.c

@@ -6,6 +6,7 @@
 
 #ifdef _WIN32
 #include <windows.h>
+#define _CRT_SECURE_NO_WARNINGS
 #endif
 
 // convert pokémon ranger 2 mes format (sequential blocks) to json
@@ -30,7 +31,7 @@ int mes_to_json(const char *input, const char *output) {
         off += 4;
         if (off + blk > size) goto error_strings;
 
-        strings[i] = xstrdup((char *)(buf + off));
+        strings[i] = strdup((char *)(buf + off));
         if (!strings[i]) goto error_strings;
 
         off += blk;
@@ -135,12 +136,12 @@ int main(int argc, char **argv) {
     }
 
     if (strcmp(argv[1], "--to-json") == 0) { // mes to json
-        output = outarg ? xstrdup(outarg) : make_output_path(input, ".json");
+        output = outarg ? strdup(outarg) : make_output_path(input, ".json");
         if (!output) return EXIT_FAILURE;
         result = mes_to_json(input, output);
 
     } else if (strcmp(argv[1], "--to-mes") == 0) { // json to mes
-        output = outarg ? xstrdup(outarg) : make_output_path(input, ".mes");
+        output = outarg ? strdup(outarg) : make_output_path(input, ".mes");
         if (!output) return EXIT_FAILURE;
         result = json_to_mes(input, output);
 

ra3mes.c

@@ -6,6 +6,7 @@
 
 #ifdef _WIN32
 #include <windows.h>
+#define _CRT_SECURE_NO_WARNINGS
 #endif
 
 // convert pokémon ranger 3 mes format (offset table) to json
@@ -27,7 +28,7 @@ int mes_to_json(const char *input, const char *output) {
         uint32_t off = read_u32_le(buf + 8 + i * 4);
         if (off >= size) goto error_strings;
 
-        strings[i] = xstrdup((char *)(buf + off));
+        strings[i] = strdup((char *)(buf + off));
         if (!strings[i]) goto error_strings;
     }
 
@@ -137,12 +138,12 @@ int main(int argc, char **argv) {
     }
 
     if (strcmp(argv[1], "--to-json") == 0) { // mes to json
-        output = outarg ? xstrdup(outarg) : make_output_path(input, ".json");
+        output = outarg ? strdup(outarg) : make_output_path(input, ".json");
         if (!output) return EXIT_FAILURE;
         result = mes_to_json(input, output);
 
     } else if (strcmp(argv[1], "--to-mes") == 0) { // json to mes
-        output = outarg ? xstrdup(outarg) : make_output_path(input, ".mes");
+        output = outarg ? strdup(outarg) : make_output_path(input, ".mes");
         if (!output) return EXIT_FAILURE;
         result = json_to_mes(input, output);
 

utils.c

@@ -33,15 +33,6 @@ int file_exists(const char *path) {
     return stat(path, &st) == 0;
 }
 
-// strdup implementation
-char *xstrdup(const char *s) {
-    if (!s) return NULL;
-    size_t len = strlen(s) + 1;
-    char *p = malloc(len);
-    if (p) memcpy(p, s, len);
-    return p;
-}
-
 // read entire file into memory
 unsigned char *read_file(const char *path, size_t *out_size) {
     FILE *f = NULL;

utils.h

@@ -13,9 +13,6 @@ void write_u32_le(unsigned char *b, uint32_t v);
 // padding to 4-byte boundary
 uint32_t pad4(uint32_t n);
 
-// strdup implementation
-char *xstrdup(const char *s);
-
 // file helpers
 int file_exists(const char *path);
 int is_json_file(const unsigned char *buf, size_t size);