projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more small audiod cleanups.
[paraslash.git]
/
audioc.c
diff --git
a/audioc.c
b/audioc.c
index 93e91178907dd71a2fcb9761b64da9852e42be35..7d472a6de5475c1eb524dab4bb3dacca64766301 100644
(file)
--- a/
audioc.c
+++ b/
audioc.c
@@
-29,7
+29,7
@@
char *tmpfifo;
enum {E_SYNTAX, E_READ, E_WRITE, E_SOCKET, E_INIT_SOCK_ADDR, E_CONNECT, E_CREDENTIALS, E_SELECT, E_OVERRUN};
enum {E_SYNTAX, E_READ, E_WRITE, E_SOCKET, E_INIT_SOCK_ADDR, E_CONNECT, E_CREDENTIALS, E_SELECT, E_OVERRUN};
-void para_log(__
unused int ll, _
_unused const char* fmt,...) /* no logging */
+void para_log(__
a_unused int ll, __a
_unused const char* fmt,...) /* no logging */
{
}
{
}
@@
-51,7
+51,7
@@
static char *concat_args(const int argc, char * const *argv)
static char *configfile_exists(void)
{
static char *config_file;
static char *configfile_exists(void)
{
static char *config_file;
-
struct stat statbuf;
+ struct stat statbuf;
if (!config_file) {
if (!config_file) {
@@
-59,7
+59,7
@@
static char *configfile_exists(void)
config_file = make_message("%s/.paraslash/audioc.conf", home);
free(home);
}
config_file = make_message("%s/.paraslash/audioc.conf", home);
free(home);
}
-
if (!stat(config_file, &statbuf))
+ if (!stat(config_file, &statbuf))
return config_file;
return NULL;
}
return config_file;
return NULL;
}
@@
-119,13
+119,10
@@
int main(int argc, char *argv[])
FD_ZERO(&wfd);
if (loaded && loaded > 10000)
fprintf(stderr, "loaded: %d\n", loaded);
FD_ZERO(&wfd);
if (loaded && loaded > 10000)
fprintf(stderr, "loaded: %d\n", loaded);
- if (loaded < conf.bufsize_arg) {
- FD_SET(fd, &rfd);
- max_fileno = MAX(max_fileno, fd);
- }
+ if (loaded < conf.bufsize_arg)
+ para_fd_set(fd, &rfd, &max_fileno);
if (loaded > 0) {
if (loaded > 0) {
- FD_SET(STDOUT_FILENO, &wfd);
- max_fileno = MAX(max_fileno, STDOUT_FILENO);
+ para_fd_set(STDOUT_FILENO, &wfd, &max_fileno);
check_write = 1;
}
ret = -E_OVERRUN;
check_write = 1;
}
ret = -E_OVERRUN;
@@
-137,7
+134,7
@@
int main(int argc, char *argv[])
goto out;
}
if (loaded < conf.bufsize_arg && FD_ISSET(fd, &rfd)) {
goto out;
}
if (loaded < conf.bufsize_arg && FD_ISSET(fd, &rfd)) {
- len = recv_bin_buffer(fd, buf + loaded,
+ len = recv_bin_buffer(fd, buf + loaded,
conf.bufsize_arg - loaded);
if (len <= 0) {
ret = len < 0? -E_READ : 0;
conf.bufsize_arg - loaded);
if (len <= 0) {
ret = len < 0? -E_READ : 0;