Better names for directory separators.

CVS patchset: 7715
CVS date: 2005/08/30 15:27:58

3 files changed, 16 insertions, 16 deletions

diff --git a/lib/os_internal.h b/lib/os_internal.h
index 0a5fbca72..2f73c8a2b 100644
--- a/lib/os_internal.h
+++ b/lib/os_internal.h
@@ -18,15 +18,15 @@
 
 
 #if defined(WIN32)
-#  define XINE_DIRECTORY_SEPARATOR_STRING ";"
-#  define XINE_DIRECTORY_SEPARATOR_CHAR ';'
-#  define XINE_SUBDIRECTORY_SEPARATOR_STRING "\\"
-#  define XINE_SUBDIRECTORY_SEPARATOR_CHAR '\\'
+#  define XINE_PATH_SEPARATOR_STRING ";"
+#  define XINE_PATH_SEPARATOR_CHAR ';'
+#  define XINE_DIRECTORY_SEPARATOR_STRING "\\"
+#  define XINE_DIRECTORY_SEPARATOR_CHAR '\\'
 #else
-#  define XINE_DIRECTORY_SEPARATOR_STRING ":"
-#  define XINE_DIRECTORY_SEPARATOR_CHAR ':'
-#  define XINE_SUBDIRECTORY_SEPARATOR_STRING "/"
-#  define XINE_SUBDIRECTORY_SEPARATOR_CHAR '/'
+#  define XINE_PATH_SEPARATOR_STRING ":"
+#  define XINE_PATH_SEPARATOR_CHAR ':'
+#  define XINE_DIRECTORY_SEPARATOR_STRING "/"
+#  define XINE_DIRECTORY_SEPARATOR_CHAR '/'
 #endif
 
 
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index dfec63876..e92f734a1 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: load_plugins.c,v 1.212 2005/08/29 15:28:16 valtri Exp $
+ * $Id: load_plugins.c,v 1.213 2005/08/30 15:27:58 valtri Exp $
  *
  *
  * Load input/demux/audio_out/video_out/codec plugins
@@ -1095,14 +1095,14 @@ void _x_scan_plugins (xine_t *this) {
     str2 = XINE_PLUGINDIR;
     len = strlen(str1) + strlen(str2) + 2;
     pluginpath = xine_xmalloc(len);
-    snprintf(pluginpath, len, "%s" XINE_DIRECTORY_SEPARATOR_STRING "%s", str1, str2);
+    snprintf(pluginpath, len, "%s" XINE_PATH_SEPARATOR_STRING "%s", str1, str2);
   }
   plugindir = xine_xmalloc(strlen(pluginpath)+strlen(homedir)+2);
   j=0;
   lenpluginpath = strlen(pluginpath);
   for (i=0; i <= lenpluginpath; ++i){
     switch (pluginpath[i]){
-    case XINE_DIRECTORY_SEPARATOR_CHAR:
+    case XINE_PATH_SEPARATOR_CHAR:
     case '\0':
       plugindir[j] = '\0';
       collect_plugins(this, plugindir);
diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c
index d96e8bbee..e0eb7f4e6 100644
--- a/src/xine-utils/utils.c
+++ b/src/xine-utils/utils.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: utils.c,v 1.40 2005/08/29 15:28:17 valtri Exp $
+ * $Id: utils.c,v 1.41 2005/08/30 15:27:58 valtri Exp $
  *
  */
 #define	_POSIX_PTHREAD_SEMANTICS 1	/* for 5-arg getpwuid_r on solaris */
@@ -372,7 +372,7 @@ static void xine_get_rootdir(char *rootdir, size_t maxlen) {
 
   strncpy(rootdir, xine_get_homedir(), maxlen - 1);
   rootdir[maxlen - 1] = '\0';
-  if ((s = strrchr(rootdir, XINE_SUBDIRECTORY_SEPARATOR_CHAR))) *s = '\0';
+  if ((s = strrchr(rootdir, XINE_DIRECTORY_SEPARATOR_CHAR))) *s = '\0';
 }
 
 const char *xine_get_plugindir(void) {
@@ -380,7 +380,7 @@ const char *xine_get_plugindir(void) {
 
   if (!plugindir[0]) {
     xine_get_rootdir(plugindir, sizeof(plugindir) - strlen(XINE_REL_PLUGINDIR) - 1);
-    strcat(plugindir, XINE_SUBDIRECTORY_SEPARATOR_STRING XINE_REL_PLUGINDIR);
+    strcat(plugindir, XINE_DIRECTORY_SEPARATOR_STRING XINE_REL_PLUGINDIR);
   }
 
   return plugindir;
@@ -391,7 +391,7 @@ const char *xine_get_fontdir(void) {
 
   if (!fontdir[0]) {
     xine_get_rootdir(fontdir, sizeof(fontdir) - strlen(XINE_REL_FONTDIR) - 1);
-    strcat(fontdir, XINE_SUBDIRECTORY_SEPARATOR_STRING XINE_REL_FONTDIR);
+    strcat(fontdir, XINE_DIRECTORY_SEPARATOR_STRING XINE_REL_FONTDIR);
   }
 
   return fontdir;
@@ -402,7 +402,7 @@ const char *xine_get_localedir(void) {
 
   if (!localedir[0]) {
     xine_get_rootdir(localedir, sizeof(localedir) - strlen(XINE_REL_LOCALEDIR) - 1);
-    strcat(localedir, XINE_SUBDIRECTORY_SEPARATOR_STRING XINE_REL_LOCALEDIR);
+    strcat(localedir, XINE_DIRECTORY_SEPARATOR_STRING XINE_REL_LOCALEDIR);
   }
 
   return localedir;