search for: exists_libvirt_auth_event

....html)\n"), + g->saved_libvirt_uri ? g->saved_libvirt_uri : "NULL"); + g->wrapper_warning_done = true; + } + + return virConnectAuthPtrDefault->cb (cred, ncred, + virConnectAuthPtrDefault->cbdata); +} + static int exists_libvirt_auth_event (guestfs_h *g) { @@ -165,31 +194,37 @@ guestfs___open_libvirt_connection (guestfs_h *g, const char *uri, unsigned int flags) { virConnectAuth authdata; - virConnectAuthPtr authdataptr; virConnectPtr conn; + const char *authtype; + + g->saved_libvirt...

...+ * return -1 here. XXX + */ + for (i = 0; i < ncred; ++i) + if (cred[i].result == NULL) + goto error; + return 0; + +error: + for (i = 0; i < ncred; ++i) { + free (cred[i].result); + cred[i].result = NULL; + cred[i].resultlen = 0; + } + return -1; +} + +static int +exists_libvirt_auth_event (guestfs_h *g) +{ + size_t i; + + for (i = 0; i < g->nr_events; ++i) + if ((g->events[i].event_bitmask & GUESTFS_EVENT_LIBVIRT_AUTH) != 0) + return 1; + + return 0; +} + +/* Open a libvirt connection (called from other parts of the library). */ +virConnectPtr +guestfs___open...

...g->saved_libvirt_uri, - strlen (g->saved_libvirt_uri)); + g->saved_libvirt_uri, + strlen (g->saved_libvirt_uri)); /* Clarified with Dan that it is not an error for some fields to be * left as NULL. @@ -189,7 +189,7 @@ exists_libvirt_auth_event (guestfs_h *g) /* Open a libvirt connection (called from other parts of the library). */ virConnectPtr guestfs_int_open_libvirt_connection (guestfs_h *g, const char *uri, - unsigned int flags) + unsigned int flags) { virConnectAuth authdata; virCo...

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.