[libvirt] [PATCHv2 2/3] qemu: simplify list cleanup

Daniel P. Berrange berrange at redhat.com
Wed Sep 4 13:54:31 UTC 2013


On Wed, Aug 28, 2013 at 03:01:23PM -0600, Eric Blake wrote:
> No need to open code now that we have a nice function.
> 
> Interestingly, our virStringFreeList function is typed correctly
> (a malloc'd list of malloc'd strings is NOT const, whether at the
> point where it is created, or at the point where it is cleand up),
> so using it with a 'const char **' argument would require a cast
> to keep the compiler.  I chose instead to remove const from code
> even where we don't modify the argument, just to avoid the need
> to cast.
> 
> * src/qemu/qemu_command.h (qemuParseCommandLine): Drop declaration.
> * src/qemu/qemu_command.c (qemuParseProcFileStrings)
> (qemuStringToArgvEnv): Don't force malloc'd result to be const.
> (qemuParseCommandLinePid, qemuParseCommandLineString): Simplify
> cleanup.
> (qemuParseCommandLine, qemuFindEnv): Drop const-correctness to
> avoid the need to cast in callers.
> 
> Signed-off-by: Eric Blake <eblake at redhat.com>
> ---
> 
> v2: fix compilation, and extend the cleanup
> 
>  src/qemu/qemu_command.c | 72 +++++++++++++++++++------------------------------
>  src/qemu/qemu_command.h |  7 -----
>  2 files changed, 27 insertions(+), 52 deletions(-)

ACK,

This duplicates part of my patch, but yours has a better commit
message wrt these hunks, so please push this change & i'll rebase
mine.


Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|




More information about the libvir-list mailing list