search for: guestfs_int_match6

...\ + } + /* The type field of a parsed mountable. * * This is used both by mountable_t in the daemon, and diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index 22b6c6c..3707c1b 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -710,30 +710,6 @@ extern int guestfs_int_match6 (guestfs_h *g, const char *str, const pcre *re, ch #define match4 guestfs_int_match4 #define match6 guestfs_int_match6 -/* Macro which compiles the regexp once when the library is loaded, - * and frees it when the library is unloaded. - */ -#define COMPILE_REGEXP(name,pattern,options)...

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.

...har **ret3, char **ret4) + char **ret1, char **ret2, char **ret3, char **ret4) { size_t len = strlen (str); int vec[30], r; @@ -132,8 +132,8 @@ guestfs_int_match4 (guestfs_h *g, const char *str, const pcre *re, /* Match a regular expression which contains exactly six captures. */ int guestfs_int_match6 (guestfs_h *g, const char *str, const pcre *re, - char **ret1, char **ret2, char **ret3, char **ret4, - char **ret5, char **ret6) + char **ret1, char **ret2, char **ret3, char **ret4, + char **ret5, char **ret6) { size_t len = strlen (str); int vec...

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