[Box Backup-commit] COMMIT r1438 - box/chris/general/lib/win32

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2007-03-24 14:36:17 +0000 (Sat, 24 Mar 2007)
New Revision: 1438

Modified:
   box/chris/general/lib/win32/emu.cpp
   box/chris/general/lib/win32/emu.h
Log:
Compile fix (wrong variable names in emu_rename)

Compile fix (wrong return type of emu_rename in emu.h prototype)


Modified: box/chris/general/lib/win32/emu.cpp
===================================================================
--- box/chris/general/lib/win32/emu.cpp	2007-03-24 00:40:59 UTC (rev 1437)
+++ box/chris/general/lib/win32/emu.cpp	2007-03-24 14:36:17 UTC (rev 1438)
@@ -1611,7 +1611,7 @@
 
 int emu_rename(const char* pOldFileName, const char* pNewFileName)
 {
-	std::string OldFilePathWithUnicode = 
+	std::string OldPathWithUnicode = 
 		ConvertPathToAbsoluteUnicode(pOldFileName);
 
 	if (OldPathWithUnicode.size() == 0)
@@ -1626,7 +1626,7 @@
 		return -1;
 	}
 
-	std::string NewFilePathWithUnicode = 
+	std::string NewPathWithUnicode = 
 		ConvertPathToAbsoluteUnicode(pNewFileName);
 
 	if (NewPathWithUnicode.size() == 0)

Modified: box/chris/general/lib/win32/emu.h
===================================================================
--- box/chris/general/lib/win32/emu.h	2007-03-24 00:40:59 UTC (rev 1437)
+++ box/chris/general/lib/win32/emu.h	2007-03-24 14:36:17 UTC (rev 1438)
@@ -337,7 +337,7 @@
 int   emu_utimes (const char* pName, const struct timeval[]);
 int   emu_chmod  (const char* pName, mode_t mode);
 char* emu_getcwd (char* pBuffer,     int BufSize);
-char* emu_rename (const char* pOldName, const char* pNewName);
+int   emu_rename (const char* pOldName, const char* pNewName);
 
 #define chdir(directory)        emu_chdir  (directory)
 #define mkdir(path,     mode)   emu_mkdir  (path)