search for: cred_siz

...ted_credentials[i].defresult) + return safe_strdup (g, g->requested_credentials[i].defresult); + else + return safe_strdup (g, ""); +} + +int +guestfs__set_libvirt_requested_credential (guestfs_h *g, int index, + const char *cred, size_t cred_size) +{ + size_t i; + + CHECK_IN_EVENT_HANDLER (-1); + + if (index >= 0 && (unsigned int) index < g->nr_requested_credentials) + i = (size_t) index; + else { + error (g, _("credential index out of range")); + return -1; + } + + /* All the evidence is that libv...

...return ret.argv; /* caller frees */ @@ -324,7 +324,7 @@ guestfs_impl_get_libvirt_requested_credential_defresult (guestfs_h *g, int index int guestfs_impl_set_libvirt_requested_credential (guestfs_h *g, int index, - const char *cred, size_t cred_size) + const char *cred, size_t cred_size) { size_t i; diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 79e7ba6..124eef0 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -52,7 +52,7 @@ ignore_errors (void *ignore, virErrorPtr ignore2) int guestfs_impl_...

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.