projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix gcc warnings on shadowed declarations
[paraslash.git]
/
gui_common.c
diff --git
a/gui_common.c
b/gui_common.c
index d806ebe2df2b6e741ce80837fc59e3c28acb9536..87676986719c326340d1612ec85763349d2225be 100644
(file)
--- a/
gui_common.c
+++ b/
gui_common.c
@@
-1,4
+1,5
@@
#include "para.h"
#include "para.h"
+#include "fd.h"
extern const char *status_item_list[NUM_STAT_ITEMS];
extern const char *status_item_list[NUM_STAT_ITEMS];
@@
-7,8
+8,14
@@
int para_open_audiod_pipe(char *cmd)
{
int fds[3] = {0, 1, 0};
pid_t pid;
{
int fds[3] = {0, 1, 0};
pid_t pid;
- return para_exec_cmdline_pid(&pid, cmd, fds) > 0?
- fds[1] : -1;
+ int ret = para_exec_cmdline_pid(&pid, cmd, fds);
+ if (ret < 0)
+ return ret;
+ ret = mark_fd_nonblock(fds[1]);
+ if (ret > 0)
+ return fds[1];
+ close(fds[1]);
+ return ret;
}
int read_audiod_pipe(int fd, void (*line_handler)(char *) )
}
int read_audiod_pipe(int fd, void (*line_handler)(char *) )
@@
-24,7
+31,7
@@
int read_audiod_pipe(int fd, void (*line_handler)(char *) )
if (ret > 0) {
loaded += ret;
buf[loaded] = '\0';
if (ret > 0) {
loaded += ret;
buf[loaded] = '\0';
- loaded = for_each_line(buf, loaded, line_handler
, 0
);
+ loaded = for_each_line(buf, loaded, line_handler);
}
return ret;
}
}
return ret;
}