Changeset 40934 in vbox for trunk/src/VBox/Runtime/common/path

Timestamp:

Apr 16, 2012 5:53:05 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

77485

Message:

Runtime: linux 3.4-rc3 build fix [-fpermissive]

Location:

trunk/src/VBox/Runtime/common/path

Files:

• RTPathAbsDup.cpp (modified) (1 diff)
• RTPathAbsExDup.cpp (modified) (1 diff)
• RTPathExt.cpp (modified) (4 diffs)
• RTPathFilename.cpp (modified) (1 diff)
• RTPathParse.cpp (modified) (1 diff)
• RTPathRealDup.cpp (modified) (1 diff)
• RTPathStripExt.cpp (modified) (2 diffs)
• RTPathStripFilename.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/path/RTPathAbsDup.cpp

@@ -49 +49 @@
     if (RT_SUCCESS(rc))
         return RTStrDup(szPath);
-    return NULL;
+    return (char *)NULL;
 }
 

trunk/src/VBox/Runtime/common/path/RTPathAbsExDup.cpp

@@ -53 +53 @@
     if (RT_SUCCESS(rc))
         return RTStrDup(szPath);
-    return NULL;
+    return (char *)NULL;
 }
 

trunk/src/VBox/Runtime/common/path/RTPathExt.cpp

@@ -43 +43 @@
 {
     const char *psz = pszPath;
-    const char *pszExt = NULL;
+    const char *pszExt = (char *)NULL;
 
     for (;; psz++)
@@ -52 +52 @@
 #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
             case ':':
-                pszExt = NULL;
+                pszExt = (char *)NULL;
                 break;
 
@@ -58 +58 @@
 #endif
             case '/':
-                pszExt = NULL;
+                pszExt = (char *)NULL;
                 break;
             case '.':
@@ -68 +68 @@
                 if (pszExt)
                     return (char *)(void *)pszExt;
-                return NULL;
+                return (char *)NULL;
         }
     }
 
     /* will never get here */
-    return NULL;
+    return (char *)NULL;
 }
 

trunk/src/VBox/Runtime/common/path/RTPathFilename.cpp

@@ -67 +67 @@
                 if (*pszName)
                     return (char *)(void *)pszName;
-                return NULL;
+                return (char *)NULL;
         }
     }

trunk/src/VBox/Runtime/common/path/RTPathParse.cpp

@@ -56 +56 @@
     ssize_t     offRoot = 0;
     const char *pszName = pszPath;
-    const char *pszLastDot = NULL;
+    const char *pszLastDot = (char *)NULL;
 
     for (;; psz++)

trunk/src/VBox/Runtime/common/path/RTPathRealDup.cpp

@@ -50 +50 @@
     if (RT_SUCCESS(rc))
         return RTStrDup(szPath);
-    return NULL;
+    return (char *)NULL;
 }
 

trunk/src/VBox/Runtime/common/path/RTPathStripExt.cpp

@@ -42 +42 @@
 RTDECL(void) RTPathStripExt(char *pszPath)
 {
-    char *pszDot = NULL;
+    char *pszDot = (char *)NULL;
     for (;; pszPath++)
     {
@@ -53 +53 @@
 #endif
             case '/':
-                pszDot = NULL;
+                pszDot = (char *)NULL;
                 break;
             case '.':

trunk/src/VBox/Runtime/common/path/RTPathStripFilename.cpp

@@ -44 +44 @@
 {
     char *psz = pszPath;
-    char *pszLastSep = NULL;
+    char *pszLastSep = (char *)NULL;