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

input/file: return NULL instead of "false"

Browse Source
This commit is contained in:
Max Kellermann 2011-09-15 09:48:28 +02:00
parent f2be6432a9
commit ce9aeed4cb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/input/file_input_plugin.c
View File

@ -53,7 +53,7 @@ input_file_open(const char *filename, GError **error_r)
struct file_input_stream *fis; struct file_input_stream *fis;
if (!g_path_is_absolute(filename)) if (!g_path_is_absolute(filename))
return false; return NULL;
fd = open_cloexec(filename, O_RDONLY|O_BINARY, 0); fd = open_cloexec(filename, O_RDONLY|O_BINARY, 0);
if (fd < 0) { if (fd < 0) {
@ -61,7 +61,7 @@ input_file_open(const char *filename, GError **error_r)
g_set_error(error_r, file_quark(), errno, g_set_error(error_r, file_quark(), errno,
"Failed to open \"%s\": %s", "Failed to open \"%s\": %s",
filename, g_strerror(errno)); filename, g_strerror(errno));
return false; return NULL;
} }
ret = fstat(fd, &st); ret = fstat(fd, &st);
@ -70,14 +70,14 @@ input_file_open(const char *filename, GError **error_r)
"Failed to stat \"%s\": %s", "Failed to stat \"%s\": %s",
filename, g_strerror(errno)); filename, g_strerror(errno));
close(fd); close(fd);
return false; return NULL;
} }
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, file_quark(), 0,
"Not a regular file: %s", filename); "Not a regular file: %s", filename);
close(fd); close(fd);
return false; return NULL;
} }
#ifdef POSIX_FADV_SEQUENTIAL #ifdef POSIX_FADV_SEQUENTIAL

2
src/input_stream.c
View File

@ -64,7 +64,7 @@ input_stream_open(const char *url, GError **error_r)
} }
g_set_error(error_r, input_quark(), 0, "Unrecognized URI"); g_set_error(error_r, input_quark(), 0, "Unrecognized URI");
return false; return NULL;
} }
void void