On 12/02/2019 14:47, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" <dgilb...@redhat.com> > > Kill off a pile of monitor_printf's and cur_mon usage. > The only one left in wavcapture.c is the info case. > > Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com> > --- > audio/wavcapture.c | 39 +++++++++++++++++---------------------- > 1 file changed, 17 insertions(+), 22 deletions(-) > > diff --git a/audio/wavcapture.c b/audio/wavcapture.c > index cf31ed652c..cd24570aa7 100644 > --- a/audio/wavcapture.c > +++ b/audio/wavcapture.c > @@ -38,30 +38,29 @@ static void wav_destroy (void *opaque) > uint8_t dlen[4]; > uint32_t datalen = wav->bytes; > uint32_t rifflen = datalen + 36; > - Monitor *mon = cur_mon; > > if (wav->f) { > le_store (rlen, rifflen, 4); > le_store (dlen, datalen, 4); > > if (fseek (wav->f, 4, SEEK_SET)) { > - monitor_printf (mon, "wav_destroy: rlen fseek failed\nReason: > %s\n", > - strerror (errno)); > + error_report("wav_destroy: rlen fseek failed: %s", > + strerror(errno)); > goto doclose; > } > if (fwrite (rlen, 4, 1, wav->f) != 1) { > - monitor_printf (mon, "wav_destroy: rlen fwrite failed\nReason > %s\n", > - strerror (errno)); > + error_report("wav_destroy: rlen fwrite failed: %s", > + strerror(errno)); > goto doclose; > } > if (fseek (wav->f, 32, SEEK_CUR)) { > - monitor_printf (mon, "wav_destroy: dlen fseek failed\nReason > %s\n", > - strerror (errno)); > + error_report("wav_destroy: dlen fseek failed: %s", > + strerror(errno)); > goto doclose; > } > if (fwrite (dlen, 1, 4, wav->f) != 4) { > - monitor_printf (mon, "wav_destroy: dlen fwrite failed\nReason > %s\n", > - strerror (errno)); > + error_report("wav_destroy: dlen fwrite failed: %s", > + strerror(errno)); > goto doclose; > } > doclose: > @@ -78,8 +77,7 @@ static void wav_capture (void *opaque, void *buf, int size) > WAVState *wav = opaque; > > if (fwrite (buf, size, 1, wav->f) != 1) { > - monitor_printf (cur_mon, "wav_capture: fwrite error\nReason: %s", > - strerror (errno)); > + error_report("wav_capture: fwrite error: %s", strerror(errno)); > } > wav->bytes += size; > } > @@ -110,7 +108,6 @@ static struct capture_ops wav_capture_ops = { > int wav_start_capture (CaptureState *s, const char *path, int freq, > int bits, int nchannels) > { > - Monitor *mon = cur_mon; > WAVState *wav; > uint8_t hdr[] = { > 0x52, 0x49, 0x46, 0x46, 0x00, 0x00, 0x00, 0x00, 0x57, 0x41, 0x56, > @@ -124,13 +121,13 @@ int wav_start_capture (CaptureState *s, const char > *path, int freq, > CaptureVoiceOut *cap; > > if (bits != 8 && bits != 16) { > - monitor_printf (mon, "incorrect bit count %d, must be 8 or 16\n", > bits); > + error_report("incorrect bit count %d, must be 8 or 16", bits); > return -1; > } > > if (nchannels != 1 && nchannels != 2) { > - monitor_printf (mon, "incorrect channel count %d, must be 1 or 2\n", > - nchannels); > + error_report("incorrect channel count %d, must be 1 or 2", > + nchannels); > return -1; > } > > @@ -158,8 +155,8 @@ int wav_start_capture (CaptureState *s, const char *path, > int freq, > > wav->f = fopen (path, "wb"); > if (!wav->f) { > - monitor_printf (mon, "Failed to open wave file `%s'\nReason: %s\n", > - path, strerror (errno)); > + error_report("Failed to open wave file `%s': %s", > + path, strerror(errno)); > g_free (wav); > return -1; > } > @@ -170,14 +167,13 @@ int wav_start_capture (CaptureState *s, const char > *path, int freq, > wav->freq = freq; > > if (fwrite (hdr, sizeof (hdr), 1, wav->f) != 1) { > - monitor_printf (mon, "Failed to write header\nReason: %s\n", > - strerror (errno)); > + error_report("Failed to write header: %s", strerror(errno)); > goto error_free; > } > > cap = AUD_add_capture (&as, &ops, wav); > if (!cap) { > - monitor_printf (mon, "Failed to add audio capture\n"); > + error_report("Failed to add audio capture"); > goto error_free; > } > > @@ -189,8 +185,7 @@ int wav_start_capture (CaptureState *s, const char *path, > int freq, > error_free: > g_free (wav->path); > if (fclose (wav->f)) { > - monitor_printf (mon, "Failed to close wave file\nReason: %s\n", > - strerror (errno)); > + error_report("Failed to close wave file: %s", strerror(errno)); > } > g_free (wav); > return -1; >
Applied the one from 2017-03 (20170320173840.3626-3-dgilb...@redhat.com), as it as Gerd's R-b and it is identical, to my trivial-patches branch. Thanks, Laurent