Re: [libvirt] [PATCH] remove useless code

"Daniel P. Berrange" <berrange(a)redhat.com&gt; wrote: ... > These two are not safe to remove. Look at the whole code block in > question: > > if (diskVal->list == NULL) > VIR_FREE(diskVal); > else if (virConfSetValue(conf, "disk", diskVal) < 0) { > diskVal = NULL; > goto no_memory; > } > diskVal = NULL; > > In the case where virConfSetValue returned >= 0, we need to > still set diskVal = NULL. Oops. Thanks. However, the original code is ugly enough that I have rewritten it to make it clear that regardless of the virConfSetValue outcome, we don't free that variable: if (diskVal->list != NULL) { bool err = (virConfSetValue(conf, "disk", diskVal) < 0); diskVal = NULL; if (err) goto no_memory; } VIR_FREE(diskVal);