Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-11-18 16:01:23 +00:00
31 changed files with 141 additions and 83 deletions

5
job.c
View File

@ -149,7 +149,7 @@ job_free(struct job *job)
/* Called when output buffer falls below low watermark (default is 0). */
void
job_write_callback(unused struct bufferevent *bufev, void *data)
job_write_callback(__unused struct bufferevent *bufev, void *data)
{
struct job *job = data;
size_t len = EVBUFFER_LENGTH(EVBUFFER_OUTPUT(job->event));
@ -165,7 +165,8 @@ job_write_callback(unused struct bufferevent *bufev, void *data)
/* Job buffer error callback. */
void
job_callback(unused struct bufferevent *bufev, unused short events, void *data)
job_callback(__unused struct bufferevent *bufev, __unused short events,
void *data)
{
struct job *job = data;