mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename global 'xdr_str'.

Browse Source 
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.
This commit is contained in:
Richard Jones
2010-08-25 11:41:17 +01:00
parent 6d15d4e7c2
commit 27ef6f9171
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fish/rc_protocol.x
View File

@@ -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;
};

10
src/generator.ml
View File

@@ -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;