diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-08-22 06:36:51 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2006-08-22 06:36:51 +0000 |
| commit | 504d3425f2270aa07e81a2f8114fe3a6268e960c (patch) | |
| tree | a3f1deacb9ed1ff800854e2f63e60444463d2256 | |
| parent | 72c12ff7680e21929ea528ac304fcccdbd7a2664 (diff) | |
| download | mpd-504d3425f2270aa07e81a2f8114fe3a6268e960c.tar.gz mpd-504d3425f2270aa07e81a2f8114fe3a6268e960c.tar.xz mpd-504d3425f2270aa07e81a2f8114fe3a6268e960c.zip | |
get rid of the pointless xopen wrapper, open(2) does not throw errno = EINTR
git-svn-id: https://svn.musicpd.org/mpd/trunk@4663 09075e82-0dd4-0310-85a5-a0d7c8717e4f
| -rw-r--r-- | src/log.c | 8 | ||||
| -rw-r--r-- | src/utils.h | 7 |
2 files changed, 4 insertions, 11 deletions
@@ -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; diff --git a/src/utils.h b/src/utils.h index d39c8e283..28b2845c6 100644 --- a/src/utils.h +++ b/src/utils.h @@ -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); |