From 27ef6f9171127afd248f38d280cf3d0eae51fdaf Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Wed, 25 Aug 2010 11:41:17 +0100 Subject: [PATCH] Rename global 'xdr_str'. Two bits of XDR both contained a definition called 'str' which means that 'xdr_str' was being exported globally twice. Because of the linker script this didn't affect us. But it's best to rename this global so that conflicts cannot arise. --- fish/rc_protocol.x | 4 ++-- src/generator.ml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fish/rc_protocol.x b/fish/rc_protocol.x index 9d8f0e9..fa99a5e 100644 --- a/fish/rc_protocol.x +++ b/fish/rc_protocol.x @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -typedef string str<>; +typedef string guestfish_str<>; struct guestfish_hello { /* Client and server version strings must match exactly. We change @@ -27,7 +27,7 @@ struct guestfish_hello { struct guestfish_call { string cmd<>; - str args<>; + guestfish_str args<>; bool exit_on_error; }; diff --git a/src/generator.ml b/src/generator.ml index 00caa6a..c25c871 100755 --- a/src/generator.ml +++ b/src/generator.ml @@ -6213,7 +6213,7 @@ and generate_xdr () = generate_header CStyle LGPLv2plus; (* This has to be defined to get around a limitation in Sun's rpcgen. *) - pr "typedef string str<>;\n"; + pr "typedef string guestfs_str<>;\n"; pr "\n"; (* Internal structures. *) @@ -6248,8 +6248,8 @@ and generate_xdr () = function | Pathname n | Device n | Dev_or_Path n | String n | Key n -> pr " string %s<>;\n" n - | OptString n -> pr " str *%s;\n" n - | StringList n | DeviceList n -> pr " str %s<>;\n" n + | OptString n -> pr " guestfs_str *%s;\n" n + | StringList n | DeviceList n -> pr " guestfs_str %s<>;\n" n | Bool n -> pr " bool %s;\n" n | Int n -> pr " int %s;\n" n | Int64 n -> pr " hyper %s;\n" n @@ -6281,7 +6281,7 @@ and generate_xdr () = pr "};\n\n" | RStringList n -> pr "struct %s_ret {\n" name; - pr " str %s<>;\n" n; + pr " guestfs_str %s<>;\n" n; pr "};\n\n" | RStruct (n, typ) -> pr "struct %s_ret {\n" name; @@ -6293,7 +6293,7 @@ and generate_xdr () = pr "};\n\n" | RHashtable n -> pr "struct %s_ret {\n" name; - pr " str %s<>;\n" n; + pr " guestfs_str %s<>;\n" n; pr "};\n\n" | RBufferOut n -> pr "struct %s_ret {\n" name; -- 1.8.3.1