oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

get rid of the pointless xopen wrapper, open(2) does not throw errno = EINTR

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@4663 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Eric Wong 2006-08-22 06:36:51 +00:00
parent 72c12ff768
commit 504d3425f2
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/log.c
View File

@ -149,14 +149,14 @@ void open_log_files(const int use_stdout)
prev = umask(0066);
param = parseConfigFilePath(CONF_LOG_FILE, 1);
out_filename = param->value;
out_fd = xopen(out_filename, O_CREAT | O_WRONLY | O_APPEND, 0666);
out_fd = open(out_filename, O_CREAT | O_WRONLY | O_APPEND, 0666);
if (out_fd < 0)
FATAL("problem opening log file \"%s\" (config line %i) for "
"writing\n", param->value, param->line);
param = parseConfigFilePath(CONF_ERROR_FILE, 1);
err_filename = param->value;
err_fd = xopen(err_filename, O_CREAT | O_WRONLY | O_APPEND, 0666);
err_fd = open(err_filename, O_CREAT | O_WRONLY | O_APPEND, 0666);
if (err_fd < 0)
FATAL("problem opening error file \"%s\" (config line %i) for "
"writing\n", param->value, param->line);
@ -226,13 +226,13 @@ int cycle_log_files(void)
prev = umask(0066);
out_fd = xopen(out_filename, O_CREAT | O_WRONLY | O_APPEND, 0666);
out_fd = open(out_filename, O_CREAT | O_WRONLY | O_APPEND, 0666);
if (out_fd < 0) {
ERROR("error re-opening log file: %s\n", out_filename);
return -1;
}
err_fd = xopen(err_filename, O_CREAT | O_WRONLY | O_APPEND, 0666);
err_fd = open(err_filename, O_CREAT | O_WRONLY | O_APPEND, 0666);
if (err_fd < 0) {
ERROR("error re-opening error file: %s\n", err_filename);
return -1;

7
src/utils.h
View File

@ -46,13 +46,6 @@ char *appendToString(char *dest, const char *src);
unsigned long readLEuint32(const unsigned char *p);
/* trivial functions, keep them inlined */
static inline int xopen(const char *path, int flags, mode_t mode)
{
int fd;
while(0>(fd = open(path,flags,mode)) && errno == EINTR);
return fd;
}
static inline void xclose(int fd)
{
while (close(fd) && errno == EINTR);