cpp/openttd-patchpack/source Changeset - r2255:9b77be8fc0fa

Changeset - r2255:9b77be8fc0fa

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

tron - 19 years ago 2005-08-01 00:14:22
tron@openttd.org

(svn r2775) Deleting a file can fail, display an error message when it happens

5 files changed with 10 insertions and 8 deletions:

hal.h

misc_gui.c

os2.c

unix.c

win32.c

0 comments (0 inline, 0 general)

hal.h

➞

Show inline comments

@@ @@ -87,7 +87,7 @@ char *FiosBrowseTo(const FiosItem *item) @@
 // Return path, free space and stringID
 StringID FiosGetDescText(const char **path, uint32 *tot);
 // Delete a name
-void FiosDelete(const char *name);
+bool FiosDelete(const char *name);
 // Make a filename from a name
 void FiosMakeSavegameName(char *buf, const char *name);

misc_gui.c

➞

Show inline comments

@@ @@ -1328,7 +1328,9 @@ static void SaveLoadDlgWndProc(Window *w @@
 		break;
 	case WE_TIMEOUT:
 		if (HASBIT(w->click_state, 10)) { /* Delete button clicked */
 			FiosDelete(WP(w,querystr_d).text.buf);
 			if (!FiosDelete(WP(w,querystr_d).text.buf)) {
 				ShowErrorMessage(INVALID_STRING_ID, STR_4008_UNABLE_TO_DELETE_FILE, 0, 0);
+			}
 			SetWindowDirty(w);
 			BuildFileList();
 			if (_saveload_mode == SLD_SAVE_GAME) {

os2.c

➞

Show inline comments

@@ @@ -415,12 +415,12 @@ void FiosMakeSavegameName(char *buf, con @@
 	sprintf(buf, "%s\\%s%s", _fios_path, name, extension);
+}
-void FiosDelete(const char *name)
+bool FiosDelete(const char *name)
+{
 	char path[512];
 	snprintf(path, lengthof(path), "%s\\%s", _fios_path, name);
 	unlink(path);
+	return unlink(path) == 0;
+}
 bool FileExists(const char *filename)

unix.c

➞

Show inline comments

@@ @@ -353,12 +353,12 @@ void FiosMakeSavegameName(char *buf, con @@
 	sprintf(buf, "%s/%s%s", _fios_path, name, extension);
+}
-void FiosDelete(const char *name)
+bool FiosDelete(const char *name)
+{
 	char path[512];
 	snprintf(path, lengthof(path), "%s/%s", _fios_path, name);
 	unlink(path);
+	return unlink(path) == 0;
+}
 bool FileExists(const char *filename)

win32.c

➞

Show inline comments

@@ @@ -911,12 +911,12 @@ void FiosMakeSavegameName(char *buf, con @@
 	sprintf(buf, "%s\\%s%s", _fios_path, name, extension);
+}
-void FiosDelete(const char *name)
+bool FiosDelete(const char *name)
+{
 	char path[512];
 	snprintf(path, lengthof(path), "%s\\%s", _fios_path, name);
 	DeleteFile(path);
+	return DeleteFile(path) != 0;
+}
 bool FileExists(const char *filename)

0 comments (0 inline, 0 general)