X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=125df1c1d94440f7cfabad1b56ef55f1ffaa4110;hp=3b87335f9adff268aee8f91c23cf565f1210b09e;hb=19d9318abf42debb15d833d4e56ab636893285c3;hpb=51dde9efab2d662cf5813d26d5c9aebce6e197e7 diff --git a/write.c b/write.c index 3b87335f..125df1c1 100644 --- a/write.c +++ b/write.c @@ -28,11 +28,11 @@ struct check_wav_task { char *buf; /** Number of bytes loaded in \a buf. */ size_t *loaded; - /** Non-zero if end of file was reached. */ - int *eof; + /** Non-zero if an error occurred or end of file was reached. */ + int *error; /** Number of channels specified in wav header given by \a buf. */ unsigned channels; - /** Samplerate specified in wav header given by \a buf. */ + /** Sample rate specified in wav header given by \a buf. */ unsigned samplerate; /** The task structure for this task. */ struct task task; @@ -67,7 +67,7 @@ static void check_wav_pre_select(__a_unused struct sched *s, struct task *t) unsigned char *a; if (*wt->loaded < WAV_HEADER_LEN) { - t->ret = *wt->eof? -E_PREMATURE_END : 1; + t->ret = *wt->error? -E_PREMATURE_END : 1; return; } wt->channels = 2; @@ -170,7 +170,7 @@ static void idt_event_handler(struct task *t) unregister_task(t); wng->buf = sit.buf; wng->loaded = &sit.loaded; - wng->input_eof = &sit.eof; + wng->input_error = &sit.error; wng->task.event_handler = wng_event_handler; wng->channels = &cwt.channels; wng->samplerate = &cwt.samplerate; @@ -234,7 +234,7 @@ int main(int argc, char *argv[]) cwt.task.event_handler = cwt_event_handler; cwt.buf = sit.buf; cwt.loaded = &sit.loaded; - cwt.eof = &sit.eof; + cwt.error = &sit.error; sprintf(cwt.task.status, "check wav"); register_task(&cwt.task);