diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2010-10-20 10:49:59 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2010-10-22 17:11:32 +0100 |
| commit | 87be9b26e7004a9a58970b4e97d0d152dc1c0704 (patch) | |
| tree | 58d7c7c678861f02a6a546ec3d92cb2381532e62 | |
| parent | cd29c50ca820a03b9cecb300a84fb884425cb565 (diff) | |
| download | libguestfs-87be9b26e7004a9a58970b4e97d0d152dc1c0704.tar.gz libguestfs-87be9b26e7004a9a58970b4e97d0d152dc1c0704.tar.xz libguestfs-87be9b26e7004a9a58970b4e97d0d152dc1c0704.zip | |
generator: Rearrange argt logically (RHBZ#642934,CVE-2010-3851).
This structure has accreted over time. Rearrange the types
into a logical order.
| -rw-r--r-- | generator/generator_types.ml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/generator/generator_types.ml b/generator/generator_types.ml index 0ed6f748..03805cf7 100644 --- a/generator/generator_types.ml +++ b/generator/generator_types.ml @@ -116,6 +116,9 @@ and args = argt list (* Function parameters, guestfs handle is implicit. *) * possibility in mind. *) and argt = + | Bool of string (* boolean *) + | Int of string (* int (smallish ints, signed, <= 31 bits) *) + | Int64 of string (* any 64 bit int *) | String of string (* const char *name, cannot be NULL *) | Device of string (* /dev device name, cannot be NULL *) | Pathname of string (* file name, cannot be NULL *) @@ -123,19 +126,6 @@ and argt = | OptString of string (* const char *name, may be NULL *) | StringList of string(* list of strings (each string cannot be NULL) *) | DeviceList of string(* list of Device names (each cannot be NULL) *) - | Bool of string (* boolean *) - | Int of string (* int (smallish ints, signed, <= 31 bits) *) - | Int64 of string (* any 64 bit int *) - (* These are treated as filenames (simple string parameters) in - * the C API and bindings. But in the RPC protocol, we transfer - * the actual file content up to or down from the daemon. - * FileIn: local machine -> daemon (in request) - * FileOut: daemon -> local machine (in reply) - * In guestfish (only), the special name "-" means read from - * stdin or write to stdout. - *) - | FileIn of string - | FileOut of string (* Opaque buffer which can contain arbitrary 8 bit data. * In the C API, this is expressed as <const char *, size_t> pair. * Most other languages have a string type which can contain @@ -154,6 +144,16 @@ and argt = * from the user. *) | Key of string + (* These are treated as filenames (simple string parameters) in + * the C API and bindings. But in the RPC protocol, we transfer + * the actual file content up to or down from the daemon. + * FileIn: local machine -> daemon (in request) + * FileOut: daemon -> local machine (in reply) + * In guestfish (only), the special name "-" means read from + * stdin or write to stdout. + *) + | FileIn of string + | FileOut of string type flags = | ProtocolLimitWarning (* display warning about protocol size limits *) |