Do not use inline functions for mkdir and rename

me-no-dev · me-no-dev · commit 64ccef75fb90 · 2017-03-11T09:16:34.000+02:00
diff --git a/libraries/FS/src/vfs_api.cpp b/libraries/FS/src/vfs_api.cpp
@@ -81,11 +81,6 @@ bool VFSImpl::exists(const char* path)
     return false;
 }
 
-static inline int real_rename(const char* f, const char* t)
-{
-    return rename(f,t);
-}
-
 bool VFSImpl::rename(const char* pathFrom, const char* pathTo)
 {
     if(!_mountpoint) {
@@ -114,7 +109,7 @@ bool VFSImpl::rename(const char* pathFrom, const char* pathTo)
     }
     sprintf(temp1,"%s%s", _mountpoint, pathFrom);
     sprintf(temp2,"%s%s", _mountpoint, pathTo);
-    auto rc = real_rename(temp1, temp2);
+    auto rc = ::rename(temp1, temp2);
     free(temp1);
     free(temp2);
     return rc == 0;
@@ -153,11 +148,6 @@ bool VFSImpl::remove(const char* path)
     return rc == 0;
 }
 
-static inline int real_mkdir(const char* f)
-{
-    return mkdir(f, ACCESSPERMS);
-}
-
 bool VFSImpl::mkdir(const char *path)
 {
     if(!_mountpoint) {
@@ -182,7 +172,7 @@ bool VFSImpl::mkdir(const char *path)
         return false;
     }
     sprintf(temp,"%s%s", _mountpoint, path);
-    auto rc = real_mkdir(temp);
+    auto rc = ::mkdir(temp, ACCESSPERMS);
     free(temp);
     return rc == 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -81,11 +81,6 @@ bool VFSImpl::exists(const char* path)`
`81`	`81`	`return false;`
`82`	`82`	`}`
`83`	`83`
`84`		`-static inline int real_rename(const char* f, const char* t)`
`85`		`-{`
`86`		`- return rename(f,t);`
`87`		`-}`
`88`		`-`
`89`	`84`	`bool VFSImpl::rename(const char* pathFrom, const char* pathTo)`
`90`	`85`	`{`
`91`	`86`	`if(!_mountpoint) {`
`@@ -114,7 +109,7 @@ bool VFSImpl::rename(const char* pathFrom, const char* pathTo)`
`114`	`109`	`}`
`115`	`110`	`sprintf(temp1,"%s%s", _mountpoint, pathFrom);`
`116`	`111`	`sprintf(temp2,"%s%s", _mountpoint, pathTo);`
`117`		`- auto rc = real_rename(temp1, temp2);`
	`112`	`+ auto rc = ::rename(temp1, temp2);`
`118`	`113`	`free(temp1);`
`119`	`114`	`free(temp2);`
`120`	`115`	`return rc == 0;`
`@@ -153,11 +148,6 @@ bool VFSImpl::remove(const char* path)`
`153`	`148`	`return rc == 0;`
`154`	`149`	`}`
`155`	`150`
`156`		`-static inline int real_mkdir(const char* f)`
`157`		`-{`
`158`		`- return mkdir(f, ACCESSPERMS);`
`159`		`-}`
`160`		`-`
`161`	`151`	`bool VFSImpl::mkdir(const char *path)`
`162`	`152`	`{`
`163`	`153`	`if(!_mountpoint) {`
`@@ -182,7 +172,7 @@ bool VFSImpl::mkdir(const char *path)`
`182`	`172`	`return false;`
`183`	`173`	`}`
`184`	`174`	`sprintf(temp,"%s%s", _mountpoint, path);`
`185`		`- auto rc = real_mkdir(temp);`
	`175`	`+ auto rc = ::mkdir(temp, ACCESSPERMS);`
`186`	`176`	`free(temp);`
`187`	`177`	`return rc == 0;`
`188`	`178`	`}`