tReplaced calls to strerror() with a function that automatically converts from … | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 6c4fbfade96ab270b1a2b59afb6289f332ac34f4 | |
parent 657d284101a014fa49fbf0f61180479e1ebb9f0a | |
Author: Ben Webb <[email protected]> | |
Date: Mon, 29 Apr 2002 10:43:30 +0000 | |
Replaced calls to strerror() with a function that automatically converts | |
from the locale's charset to UTF-8 where necessary. | |
Diffstat: | |
M src/serverside.c | 22 ++++++++++++++-------- | |
1 file changed, 14 insertions(+), 8 deletions(-) | |
--- | |
diff --git a/src/serverside.c b/src/serverside.c | |
t@@ -746,7 +746,6 @@ void ServerHelp(void) | |
void CreatePidFile(void) | |
{ | |
FILE *fp; | |
- char *OpenError; | |
if (!PidFile) | |
return; | |
t@@ -757,8 +756,9 @@ void CreatePidFile(void) | |
fclose(fp); | |
chmod(PidFile, S_IREAD | S_IWRITE); | |
} else { | |
- OpenError = strerror(errno); | |
+ gchar *OpenError = ErrStrFromErrno(errno); | |
g_warning(_("Cannot create pid file %s: %s"), PidFile, OpenError); | |
+ g_free(OpenError); | |
} | |
} | |
t@@ -1804,7 +1804,7 @@ void ConvertHighScoreFile(void) | |
FILE *old, *backup; | |
gchar *BackupFile; | |
int ch; | |
- char *OldError = NULL, *BackupError = NULL; | |
+ gchar *OldError = NULL, *BackupError = NULL; | |
struct HISCORE MultiScore[NUMHISCORE], AntiqueScore[NUMHISCORE]; | |
/* The user running dopewars must be allowed to mess with the score file */ | |
t@@ -1813,12 +1813,14 @@ void ConvertHighScoreFile(void) | |
BackupFile = g_strdup_printf("%s.bak", ConvertFile); | |
old = fopen(ConvertFile, "r+"); | |
- if (!old) | |
- OldError = strerror(errno); | |
+ if (!old) { | |
+ OldError = ErrStrFromErrno(errno); | |
+ } | |
backup = fopen(BackupFile, "w"); | |
- if (!backup) | |
- BackupError = strerror(errno); | |
+ if (!backup) { | |
+ BackupError = ErrStrFromErrno(errno); | |
+ } | |
if (old && backup) { | |
t@@ -1874,6 +1876,8 @@ void ConvertHighScoreFile(void) | |
} | |
g_free(BackupFile); | |
+ g_free(OldError); | |
+ g_free(BackupError); | |
} | |
/* State, set by OpenHighScoreFile, and later used by | |
t@@ -1913,12 +1917,14 @@ gboolean CheckHighScoreFileConfig(void) | |
{ | |
if (!ScoreFP) { | |
+ gchar *errstr = ErrStrFromErrno(OpenError); | |
g_log(NULL, G_LOG_LEVEL_CRITICAL, | |
_("Cannot open high score file %s.\n" | |
"(%s.) Either ensure you have permissions to access\n" | |
"this file and directory, or specify an alternate high score " | |
"file with the\n-f command line option."), | |
- HiScoreFile, strerror(OpenError)); | |
+ HiScoreFile, errstr); | |
+ g_free(errstr); | |
return FALSE; | |
} | |