projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into next
[paraslash.git]
/
oss_write.c
diff --git
a/oss_write.c
b/oss_write.c
index 103b14ea5fa16c68feeb10302454e41570673dc7..7edd486fccc37a295700b3dedd9cc0da76976e24 100644
(file)
--- a/
oss_write.c
+++ b/
oss_write.c
@@
-48,13
+48,13
@@
static int oss_pre_select(struct sched *s, struct writer_node *wn)
struct private_oss_write_data *powd = wn->private_data;
struct writer_node_group *wng = wn->wng;
struct private_oss_write_data *powd = wn->private_data;
struct writer_node_group *wng = wn->wng;
- if (
!*wng->loaded
)
+ if (
*wng->loaded - wn->written < powd->bytes_per_frame
)
return 0;
para_fd_set(powd->fd, &s->wfds, &s->max_fileno);
return 1;
}
return 0;
para_fd_set(powd->fd, &s->wfds, &s->max_fileno);
return 1;
}
-static int oss_post_select(__a_unused struct sched *s,
-
struct writer_node *wn)
+
+
static int oss_post_select(struct sched *s,
struct writer_node *wn)
{
int ret;
struct private_oss_write_data *powd = wn->private_data;
{
int ret;
struct private_oss_write_data *powd = wn->private_data;
@@
-217,4
+217,5
@@
void oss_write_init(struct writer *w)
.short_help = oss_write_args_info_help,
.detailed_help = oss_write_args_info_detailed_help
};
.short_help = oss_write_args_info_help,
.detailed_help = oss_write_args_info_detailed_help
};
+ oss_cmdline_parser_free(&dummy);
}
}