From fbb35833379176cd67677bdfe202491e27f6d4c9 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 28 Jul 2014 19:57:36 +0200
Subject: [PATCH] Rename more 'roms' references

---
 file_path.h                   | 2 +-
 libretro-test/libretro-test.c | 8 ++++----
 tests/test_reentrancy.c       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/file_path.h b/file_path.h
index f13d56c668..52429f9f2c 100644
--- a/file_path.h
+++ b/file_path.h
@@ -114,7 +114,7 @@ void fill_pathname_noext(char *out_path, const char *in_path, const char *replac
 // Basename of in_basename is the string after the last '/' or '\\', i.e the filename without directories.
 // If in_basename has no '/' or '\\', the whole 'in_basename' will be used.
 // 'size' is buffer size of 'in_dir'.
-// E.g..: in_dir = "/tmp/some_dir", in_basename = "/some_roms/foo.c", replace = ".asm" =>
+// E.g..: in_dir = "/tmp/some_dir", in_basename = "/some_content/foo.c", replace = ".asm" =>
 //    in_dir = "/tmp/some_dir/foo.c.asm"
 void fill_pathname_dir(char *in_dir, const char *in_basename, const char *replace, size_t size);
 
diff --git a/libretro-test/libretro-test.c b/libretro-test/libretro-test.c
index d2db96d1a7..72616f2937 100644
--- a/libretro-test/libretro-test.c
+++ b/libretro-test/libretro-test.c
@@ -109,8 +109,8 @@ void retro_set_environment(retro_environment_t cb)
 
    cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void*)vars);
 
-   bool no_rom = true;
-   cb(RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME, &no_rom);
+   bool no_content = true;
+   cb(RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME, &no_content);
 
    if (!cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &logging))
       logging.log = fallback_log;
@@ -118,13 +118,13 @@ void retro_set_environment(retro_environment_t cb)
    static const struct retro_subsystem_memory_info mem1[] = {{ "ram1", 0x400 }, { "ram2", 0x401 }};
    static const struct retro_subsystem_memory_info mem2[] = {{ "ram3", 0x402 }, { "ram4", 0x403 }};
 
-   static const struct retro_subsystem_rom_info roms[] = {
+   static const struct retro_subsystem_rom_info content[] = {
       { "Test Rom #1", "bin", false, false, true, mem1, 2, },
       { "Test Rom #2", "bin", false, false, true, mem2, 2, },
    };
 
    static const struct retro_subsystem_info types[] = {
-      { "Foo", "foo", roms, 2, 0x200, },
+      { "Foo", "foo", content, 2, 0x200, },
       { NULL },
    };
 
diff --git a/tests/test_reentrancy.c b/tests/test_reentrancy.c
index ef4cb3da27..d00d6da4b7 100644
--- a/tests/test_reentrancy.c
+++ b/tests/test_reentrancy.c
@@ -14,8 +14,8 @@
  */
 
 // Test module to check re-entrancy of libretro implementations.
-// Reruns RetroArch main loop with all roms defined on command-line
-// to check if libretro can load multiple roms after each other.
+// Reruns RetroArch main loop with all content defined on command-line
+// to check if libretro can load multiple content after each other.
 
 #include "../getopt_rarch.h"
 #include "../general.h"