search for: parse_serv

Make sure to not skip any of the created server, and to always free the "server" array. diff --git a/src/drives.c b/src/drives.c index 4bd8328..85c1495 100644 --- a/src/drives.c +++ b/src/drives.c @@ -743,8 +743,7 @@ parse_servers (guestfs_h *g, char *const *strs, for (i = 0; i < n; ++i) { if (parse_one_server (g, strs[i], &servers[i]) == -1) { - if (i > 0) - free_drive_servers (servers, i-1); + free_drive_servers (servers, i); return -1; } } --- src/drives.c | 3 +-- 1...

...ar 22 08:03:37 2010 -0400 mount.cifs: remove unneeded uname call Signed-off-by: Jeff Layton <jlayton at redhat.com> commit 470d8aa3bc1d7947cbe3afda6bcf7e154100f3c0 Author: Jeff Layton <jlayton at redhat.com> Date: Mon Mar 22 08:03:35 2010 -0400 mount.cifs: clean up parse_server Get rid of a lot of unnecessary nesting. Signed-off-by: Jeff Layton <jlayton at redhat.com> commit 82f2ebc299d27a86a1eba7c285c849ab5f45607d Author: Jeff Layton <jlayton at redhat.com> Date: Sat Mar 20 08:10:24 2010 -0400 mount.cifs: clean up preprocessor macr...

On Tuesday 11 March 2014 23:13:46 Richard W.M. Jones wrote: > diff --git a/src/drives.c b/src/drives.c > index 2c85b52..68e37f7 100644 > --- a/src/drives.c > +++ b/src/drives.c > @@ -115,7 +115,8 @@ static struct drive * > create_drive_file (guestfs_h *g, const char *path, > bool readonly, const char *format, > const char *iface,

...r *dumpfile, void *opaque, + guestfs_int_db_dump_callback callback) { struct cb_data data; CLEANUP_CMD_CLOSE struct command *cmd = guestfs_int_new_command (g); diff --git a/src/drives.c b/src/drives.c index d957fc4..b9cc813 100644 --- a/src/drives.c +++ b/src/drives.c @@ -729,7 +729,7 @@ parse_servers (guestfs_h *g, char *const *strs, int guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename, - const struct guestfs_add_drive_opts_argv *optargs) + const struct guestfs_add_drive_opts_argv *optargs) { struct drive_create_data data; const char *...

Result of earlier copy and paste. --- align/scan.c | 35 ++++++++++--------- cat/cat.c | 39 +++++++++++---------- cat/filesystems.c | 69 +++++++++++++++++++------------------- cat/log.c | 35 ++++++++++--------- cat/ls.c | 61 +++++++++++++++++---------------- df/main.c | 43 ++++++++++++------------ diff/diff.c | 67

libguestfs has used double and triple underscores in identifiers. These aren't valid for global names in C++. (http://stackoverflow.com/a/228797) These large but completely mechanical patches change the illegal identifiers to legal ones. Rich.