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

input/file: use errno_quark()

Browse Source
This commit is contained in:
Max Kellermann
2012-10-04 09:45:13 +02:00
parent efbf184fe8
commit ef0392e854
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/input/file_input_plugin.c
View File

@@ -23,6 +23,7 @@
#include "input_plugin.h" #include "input_plugin.h"
#include "fd_util.h" #include "fd_util.h"
#include "open.h" #include "open.h"
#include "io_error.h"
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
@@ -39,12 +40,6 @@ struct file_input_stream {
int fd; int fd;
}; };
static inline GQuark
file_quark(void)
{
return g_quark_from_static_string("file");
}
static struct input_stream * static struct input_stream *
input_file_open(const char *filename, input_file_open(const char *filename,
GMutex *mutex, GCond *cond, GMutex *mutex, GCond *cond,
@@ -60,7 +55,7 @@ input_file_open(const char *filename,
fd = open_cloexec(filename, O_RDONLY|O_BINARY, 0); fd = open_cloexec(filename, O_RDONLY|O_BINARY, 0);
if (fd < 0) { if (fd < 0) {
if (errno != ENOENT && errno != ENOTDIR) if (errno != ENOENT && errno != ENOTDIR)
g_set_error(error_r, file_quark(), errno, g_set_error(error_r, errno_quark(), errno,
"Failed to open \"%s\": %s", "Failed to open \"%s\": %s",
filename, g_strerror(errno)); filename, g_strerror(errno));
return NULL; return NULL;
@@ -68,7 +63,7 @@ input_file_open(const char *filename,
ret = fstat(fd, &st); ret = fstat(fd, &st);
if (ret < 0) { if (ret < 0) {
g_set_error(error_r, file_quark(), errno, g_set_error(error_r, errno_quark(), errno,
"Failed to stat \"%s\": %s", "Failed to stat \"%s\": %s",
filename, g_strerror(errno)); filename, g_strerror(errno));
close(fd); close(fd);
@@ -76,7 +71,7 @@ input_file_open(const char *filename,
} }
if (!S_ISREG(st.st_mode)) { if (!S_ISREG(st.st_mode)) {
g_set_error(error_r, file_quark(), 0, g_set_error(error_r, errno_quark(), 0,
"Not a regular file: %s", filename); "Not a regular file: %s", filename);
close(fd); close(fd);
return NULL; return NULL;
@@ -107,7 +102,7 @@ input_file_seek(struct input_stream *is, goffset offset, int whence,
offset = (goffset)lseek(fis->fd, (off_t)offset, whence); offset = (goffset)lseek(fis->fd, (off_t)offset, whence);
if (offset < 0) { if (offset < 0) {
g_set_error(error_r, file_quark(), errno, g_set_error(error_r, errno_quark(), errno,
"Failed to seek: %s", g_strerror(errno)); "Failed to seek: %s", g_strerror(errno));
return false; return false;
} }
@@ -125,7 +120,7 @@ input_file_read(struct input_stream *is, void *ptr, size_t size,
nbytes = read(fis->fd, ptr, size); nbytes = read(fis->fd, ptr, size);
if (nbytes < 0) { if (nbytes < 0) {
g_set_error(error_r, file_quark(), errno, g_set_error(error_r, errno_quark(), errno,
"Failed to read: %s", g_strerror(errno)); "Failed to read: %s", g_strerror(errno));
return 0; return 0;
} }