Re: [libvirt] [PATCH 1/2] virsh: change vshCommandOptString return type and fix const-correctness

On 03/08/2011 09:29 AM, Michal Privoznik wrote: s/Therfore/Therefore/; s/correcntess/correctness/ Indentation. Most of this patch looks mechanical, and since it still compilers, that means you pretty much did it correctly. Fails the useless-if-before-free 'make syntax-check' now that dir_malloced is a (possibly-NULL) pointer rather than a bool. ACK with those nits fixed, so I'm pushing with this squashed in: diff --git i/tools/virsh.c w/tools/virsh.c index 6ad4089..f7e1474 100644 --- i/tools/virsh.c +++ w/tools/virsh.c @@ -256,7 +256,7 @@ static int vshCommandOptInt(const vshCmd *cmd, const char *name, int *found); static unsigned long vshCommandOptUL(const vshCmd *cmd, const char *name, int *found); static const char *vshCommandOptString(const vshCmd *cmd, const char *name, - int *found); + int *found); static long long vshCommandOptLongLong(const vshCmd *cmd, const char *name, int *found); static int vshCommandOptBool(const vshCmd *cmd, const char *name); @@ -9546,8 +9546,7 @@ cmdCd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) ret = FALSE; } - if (dir_malloced) - VIR_FREE(dir_malloced); + VIR_FREE(dir_malloced); return ret; } -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org