On 12/18/18 5:34 AM, Peter Krempa wrote: > On Mon, Dec 17, 2018 at 09:55:46 -0500, John Ferlan wrote: >> Rather than chancing calling strchr when @err_noinfo == NULL or >> calling virErrorTestMsgFormatInfoOne when @err_info == NULL, both >> of which would fail, let's just return -1 immediately when we >> encounter an error. >> >> Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx> >> --- >> tests/virerrortest.c | 11 +++++------ >> 1 file changed, 5 insertions(+), 6 deletions(-) > > This would make the test hard to diagnose as it spits out one failure at > time. I prefer you add the checks explicitly. > To avoid wasting steps/time w/ multiple iterations, you would rather have the "err_noinfo &&" be a gate to strchr and "err_info &&" be a gate to virErrorTestMsgFormatInfoOne? So that the only diffs are: - if (strchr(err_noinfo, '%')) { + if (err_noinfo && strchr(err_noinfo, '%')) { and - if (virErrorTestMsgFormatInfoOne(err_info) < 0) + if (err_info && virErrorTestMsgFormatInfoOne(err_info) < 0) Tks - John -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list