diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-01-22 23:59:22 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-01-23 00:03:33 +0200 |
commit | b1824338b366e25756e4c64f04e535684529832d (patch) | |
tree | 2dcbf32e0b4fb06b1c4b0a992db882ba184bbd18 /src | |
parent | 2beaaadb282bd4667e3af1ed65e3944960d1bd3e (diff) | |
download | eclat-b1824338b366e25756e4c64f04e535684529832d.tar.gz eclat-b1824338b366e25756e4c64f04e535684529832d.tar.bz2 |
Namespace fixup: use "request" consistently
Diffstat (limited to 'src')
-rw-r--r-- | src/allocaddr.c | 2 | ||||
-rw-r--r-- | src/asscaddr.c | 12 | ||||
-rw-r--r-- | src/atvol.c | 6 | ||||
-rw-r--r-- | src/cpimg.c | 10 | ||||
-rw-r--r-- | src/cpsnap.c | 8 | ||||
-rw-r--r-- | src/deimg.c | 2 | ||||
-rw-r--r-- | src/devmap.c | 20 | ||||
-rw-r--r-- | src/devol.c | 10 | ||||
-rw-r--r-- | src/disasaddr.c | 4 | ||||
-rw-r--r-- | src/ec2map.c | 14 | ||||
-rw-r--r-- | src/eclat.c | 6 | ||||
-rw-r--r-- | src/eclat.h | 10 | ||||
-rw-r--r-- | src/getconout.c | 2 | ||||
-rw-r--r-- | src/lsaattr.c | 6 | ||||
-rw-r--r-- | src/lsaddr.c | 2 | ||||
-rw-r--r-- | src/lsiattr.c | 6 | ||||
-rw-r--r-- | src/lsimg-cl.opt | 8 | ||||
-rw-r--r-- | src/lsimg.c | 2 | ||||
-rw-r--r-- | src/lsinst.c | 2 | ||||
-rw-r--r-- | src/lsistat.c | 4 | ||||
-rw-r--r-- | src/lsreg.c | 2 | ||||
-rw-r--r-- | src/lssattr.c | 18 | ||||
-rw-r--r-- | src/lssg.c | 2 | ||||
-rw-r--r-- | src/lssnap.c | 4 | ||||
-rw-r--r-- | src/lstag.c | 6 | ||||
-rw-r--r-- | src/lsvol.c | 2 | ||||
-rw-r--r-- | src/lszon.c | 2 | ||||
-rw-r--r-- | src/mkimg.c | 10 | ||||
-rw-r--r-- | src/mkinst.c | 64 | ||||
-rw-r--r-- | src/mksg.c | 8 | ||||
-rw-r--r-- | src/mksnap.c | 4 | ||||
-rw-r--r-- | src/mktags.c | 14 | ||||
-rw-r--r-- | src/mkvol.c | 12 | ||||
-rw-r--r-- | src/rmaddr.c | 2 | ||||
-rw-r--r-- | src/rmsg.c | 4 | ||||
-rw-r--r-- | src/rmsnap.c | 4 | ||||
-rw-r--r-- | src/rmvol.c | 4 | ||||
-rw-r--r-- | src/setaattr.c | 10 | ||||
-rw-r--r-- | src/setiattr.c | 14 | ||||
-rw-r--r-- | src/sg-cl.opt | 6 | ||||
-rw-r--r-- | src/sg.c | 18 | ||||
-rw-r--r-- | src/startstop.c | 4 | ||||
-rw-r--r-- | src/util.c | 26 |
43 files changed, 188 insertions, 188 deletions
diff --git a/src/allocaddr.c b/src/allocaddr.c index 9d8d6d8..b6cf133 100644 --- a/src/allocaddr.c +++ b/src/allocaddr.c @@ -28,9 +28,9 @@ eclat_allocate_address(eclat_command_env_t *env, int argc, char **argv) argv += i; if (argc != 0) die(EX_USAGE, "wrong number of arguments to allocate-address"); if (vpc) - eclat_query_add_param(env->query, "Domain", "vpc"); + eclat_request_add_param(env->request, "Domain", "vpc"); return 0; } diff --git a/src/asscaddr.c b/src/asscaddr.c index 3e6ca44..26e5d5c 100644 --- a/src/asscaddr.c +++ b/src/asscaddr.c @@ -31,24 +31,24 @@ eclat_associate_address(eclat_command_env_t *env, int argc, char **argv) argv += i; if (argc != 2) die(EX_USAGE, "wrong number of arguments to associate-address"); translate_ids(1, argv, MAP_INSTANCE); - eclat_query_add_param(env->query, "InstanceId", argv[0]); + eclat_request_add_param(env->request, "InstanceId", argv[0]); if (vpc) { - eclat_query_add_param(env->query, "AllocationId", argv[1]); + eclat_request_add_param(env->request, "AllocationId", argv[1]); if (iface) - eclat_query_add_param(env->query, "NetworkInterfaceId", + eclat_request_add_param(env->request, "NetworkInterfaceId", iface); if (privaddr) - eclat_query_add_param(env->query, "PrivateIpAddress", + eclat_request_add_param(env->request, "PrivateIpAddress", privaddr); if (reassoc) - eclat_query_add_param(env->query, "AllowReassociation", + eclat_request_add_param(env->request, "AllowReassociation", "true"); } else { - eclat_query_add_param(env->query, "PublicIp", argv[1]); + eclat_request_add_param(env->request, "PublicIp", argv[1]); } return 0; } diff --git a/src/atvol.c b/src/atvol.c index b07bea2..36abcb5 100644 --- a/src/atvol.c +++ b/src/atvol.c @@ -32,12 +32,12 @@ eclat_attach_volume(eclat_command_env_t *env, int argc, char **argv) if (argc != 3) die(EX_USAGE, "bad number of arguments"); translate_ids(1, argv, MAP_VOLUME); translate_ids(1, argv + 1, MAP_INSTANCE); - eclat_query_add_param(env->query, "VolumeId", argv[0]); - eclat_query_add_param(env->query, "InstanceId", argv[1]); - eclat_query_add_param(env->query, "Device", argv[2]); + eclat_request_add_param(env->request, "VolumeId", argv[0]); + eclat_request_add_param(env->request, "InstanceId", argv[1]); + eclat_request_add_param(env->request, "Device", argv[2]); return 0; } diff --git a/src/cpimg.c b/src/cpimg.c index fa9db23..ef92ffb 100644 --- a/src/cpimg.c +++ b/src/cpimg.c @@ -17,17 +17,17 @@ #include "eclat.h" #include "cpimg-cl.h" int eclat_copy_image(eclat_command_env_t *env, int argc, char **argv) { - struct ec2_query *q = env->query; + struct ec2_request *q = env->request; parse_options(env, argc, argv); - eclat_query_add_param(q, "SourceRegion", region); - eclat_query_add_param(q, "SourceImageId", image); + eclat_request_add_param(q, "SourceRegion", region); + eclat_request_add_param(q, "SourceImageId", image); if (name) - eclat_query_add_param(q, "Name", name); + eclat_request_add_param(q, "Name", name); if (descr) - eclat_query_add_param(q, "Description", descr); + eclat_request_add_param(q, "Description", descr); return 0; } diff --git a/src/cpsnap.c b/src/cpsnap.c index 16de3f2..93e6535 100644 --- a/src/cpsnap.c +++ b/src/cpsnap.c @@ -17,16 +17,16 @@ #include "eclat.h" #include "cpsnap-cl.h" int eclat_copy_snapshot(eclat_command_env_t *env, int argc, char **argv) { - struct ec2_query *q = env->query; + struct ec2_request *q = env->request; parse_options(env, argc, argv); - eclat_query_add_param(q, "SourceRegion", region); - eclat_query_add_param(q, "SourceSnapshotId", image); + eclat_request_add_param(q, "SourceRegion", region); + eclat_request_add_param(q, "SourceSnapshotId", image); if (descr) - eclat_query_add_param(q, "Description", descr); + eclat_request_add_param(q, "Description", descr); return 0; } diff --git a/src/deimg.c b/src/deimg.c index b607fd5..67e5444 100644 --- a/src/deimg.c +++ b/src/deimg.c @@ -27,10 +27,10 @@ eclat_deregister_image(eclat_command_env_t *env, int argc, char **argv) argc -= i; if (argc != 1) die(EX_USAGE, "bad number of arguments"); translate_ids(argc, argv, MAP_IMAGE); - eclat_query_add_param(env->query, "ImageId", argv[0]); + eclat_request_add_param(env->request, "ImageId", argv[0]); return 0; } diff --git a/src/devmap.c b/src/devmap.c index 9f9a85a..54308bc 100644 --- a/src/devmap.c +++ b/src/devmap.c @@ -23,13 +23,13 @@ isnumstr(const char *p) if (!isdigit(*p)) return 0; return 1; } void -eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list) +eclat_encode_devmap(struct ec2_request *q, struct grecs_list *list) { int i; char *bufptr = NULL; size_t bufsize = 0; struct grecs_list_entry *ep; @@ -43,24 +43,24 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list) die(EX_USAGE, "malformed device mapping: %s", dev); *p++ = 0; grecs_asprintf(&bufptr, &bufsize, "BlockDeviceMapping.%d.DeviceName", i); - eclat_query_add_param(q, bufptr, dev); + eclat_request_add_param(q, bufptr, dev); if (strcmp(p, "none") == 0) { grecs_asprintf(&bufptr, &bufsize, "BlockDeviceMapping.%d.NoDevice", i); - eclat_query_add_param(q, bufptr, NULL); + eclat_request_add_param(q, bufptr, NULL); } else if (strncmp(p, "ephemeral", 9) == 0) { grecs_asprintf(&bufptr, &bufsize, "BlockDeviceMapping.%d.VirtualName", i); - eclat_query_add_param(q, bufptr, p); + eclat_request_add_param(q, bufptr, p); } else { struct wordsplit ws; /* [snapshot-id]:[volume-size]:[true|false]:[standard|io1[:iops]] */ ws.ws_delim = ":"; if (wordsplit(p, &ws, @@ -92,34 +92,34 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list) "snapshot ID, " "or disk size, " "or a device-specification", ws.ws_wordv[0]); } } - eclat_query_add_param(q, bufptr, + eclat_request_add_param(q, bufptr, ws.ws_wordv[0]); } else if (ws.ws_wordc < 2) { die(EX_USAGE, "not enough parts in device mapping \"%s\"", p); } else { if (ws.ws_wordv[0][0]) { grecs_asprintf(&bufptr, &bufsize, "BlockDeviceMapping.%d." "Ebs.SnapshotId", i); - eclat_query_add_param(q, bufptr, + eclat_request_add_param(q, bufptr, ws.ws_wordv[0]); } if (ws.ws_wordv[1][0]) { grecs_asprintf(&bufptr, &bufsize, "BlockDeviceMapping.%d." "Ebs.VolumeSize", i); - eclat_query_add_param(q, bufptr, + eclat_request_add_param(q, bufptr, ws.ws_wordv[1]); } } switch (ws.ws_wordc) { default: @@ -128,22 +128,22 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list) p); case 5: if (ws.ws_wordv[4][0]) { grecs_asprintf(&bufptr, &bufsize, "BlockDeviceMapping.%d.Ebs.Iops", i); - eclat_query_add_param(q, bufptr, + eclat_request_add_param(q, bufptr, ws.ws_wordv[4]); } /* fall through */ case 4: if (ws.ws_wordv[3][0]) { grecs_asprintf(&bufptr, &bufsize, "BlockDeviceMapping.%d.Ebs.VolumeType", i); - eclat_query_add_param(q, bufptr, + eclat_request_add_param(q, bufptr, ws.ws_wordv[3]); } /* fall through */ case 3: if (ws.ws_wordv[2][0]) { if (strcmp(ws.ws_wordv[2], "false") && @@ -153,13 +153,13 @@ eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list) "but found \"%s\"", ws.ws_wordv[2]); grecs_asprintf(&bufptr, &bufsize, "BlockDeviceMapping.%d." "Ebs.DeleteOnTermination", i); - eclat_query_add_param(q, bufptr, + eclat_request_add_param(q, bufptr, ws.ws_wordv[2]); } case 2: break; } wordsplit_free(&ws); diff --git a/src/devol.c b/src/devol.c index ceda9be..76a8423 100644 --- a/src/devol.c +++ b/src/devol.c @@ -19,28 +19,28 @@ int force; #include "devol-cl.h" int eclat_detach_volume(eclat_command_env_t *env, int argc, char **argv) { int i; - struct ec2_query *q = env->query; + struct ec2_request *q = env->request; parse_options(env, argc, argv, &i); argc -= i; argv += i; if (argc < 1 || argc > 3) die(EX_USAGE, "bad number of arguments"); translate_ids(1, argv, MAP_VOLUME); - eclat_query_add_param(q, "VolumeId", argv[0]); + eclat_request_add_param(q, "VolumeId", argv[0]); if (argc > 1) { translate_ids(1, argv + 1, MAP_INSTANCE); - eclat_query_add_param(q, "InstanceId", argv[1]); + eclat_request_add_param(q, "InstanceId", argv[1]); if (argc > 2) - eclat_query_add_param(q, "Device", argv[2]); + eclat_request_add_param(q, "Device", argv[2]); } if (force) - eclat_query_add_param(q, "Force", "true"); + eclat_request_add_param(q, "Force", "true"); return 0; } diff --git a/src/disasaddr.c b/src/disasaddr.c index 27711f6..8c6b88c 100644 --- a/src/disasaddr.c +++ b/src/disasaddr.c @@ -19,19 +19,19 @@ static int vpc; #include "disasaddr-cl.h" int eclat_disassociate_address(eclat_command_env_t *env, int argc, char **argv) { int i; - struct ec2_query *q = env->query; + struct ec2_request *q = env->request; parse_options(env, argc, argv, &i); argc -= i; argv += i; if (argc != 1) die(EX_USAGE, "wrong number of arguments to disassociate-address"); - eclat_query_add_param(q, vpc ? "AssociationId" : "PublicIp", argv[0]); + eclat_request_add_param(q, vpc ? "AssociationId" : "PublicIp", argv[0]); return 0; } diff --git a/src/ec2map.c b/src/ec2map.c index 943409c..6e2be10 100644 --- a/src/ec2map.c +++ b/src/ec2map.c @@ -135,23 +135,23 @@ ec2_map_close(int dbg, void *data) } static int ec2_map_get(int dbg, int dir, void *data, const char *key, char **return_value) { struct ec2_map *map = data; - struct ec2_query *q; + struct ec2_request *q; struct grecs_list_entry *ep; struct wordsplit ws; int wsflags; char const *env[3]; struct grecs_node *tree, *node; int rc; - q = eclat_query_create(use_ssl ? EC2_QF_HTTPS : 0, endpoint, "/", + q = eclat_request_create(use_ssl ? EC2_RF_HTTPS : 0, endpoint, "/", region_name, access_key, security_token); - eclat_query_add_param(q, "Action", map->action); + eclat_request_add_param(q, "Action", map->action); env[0] = "key"; env[1] = key; env[2] = NULL; ws.ws_env = env; @@ -168,26 +168,26 @@ ec2_map_get(int dbg, int dir, void *data, const char *key, char **return_value) break; } wsflags |= WRDSF_REUSE; p = strchr(ws.ws_wordv[0], '='); if (p) { *p++ = 0; - eclat_query_add_param(q, ws.ws_wordv[0], p); + eclat_request_add_param(q, ws.ws_wordv[0], p); } else - eclat_query_add_param(q, ws.ws_wordv[0], ""); + eclat_request_add_param(q, ws.ws_wordv[0], ""); } if (wsflags & WRDSF_REUSE) wordsplit_free(&ws); if (rc) { - eclat_query_free(q); + eclat_request_free(q); return eclat_map_failure; } - rc = eclat_send_query(map->io->curl, q); + rc = eclat_send_request(map->io->curl, q); if (rc) return eclat_map_failure; tree = eclat_io_finish(map->io); diff --git a/src/eclat.c b/src/eclat.c index 66cabdc..beaa934 100644 --- a/src/eclat.c +++ b/src/eclat.c @@ -643,28 +643,28 @@ int eclat_do_command(eclat_command_env_t *env, struct eclat_command *command, int argc, char **argv) { int rc; if (!(command->flags & CMD_NOQRY)) { - env->query = eclat_query_create(use_ssl ? EC2_QF_HTTPS : 0, + env->request = eclat_request_create(use_ssl ? EC2_RF_HTTPS : 0, endpoint, "/", region_name, access_key, security_token); } if (command->tag) - eclat_query_add_param(env->query, "Action", command->tag); + eclat_request_add_param(env->request, "Action", command->tag); rc = command->handler(env, argc, argv); if (rc == 0 && !(command->flags & CMD_NOQRY)) { if (!eclat_confirm(confirm_mode, "Proceed with %s", command->ident)) die(EX_CANCELLED, "command not confirmed"); - rc = eclat_send_query(env->curl, env->query); + rc = eclat_send_request(env->curl, env->request); } return rc; } int main(int argc, char **argv) diff --git a/src/eclat.h b/src/eclat.h index 28fcaf0..a8ac2a0 100644 --- a/src/eclat.h +++ b/src/eclat.h @@ -78,13 +78,13 @@ void config_init(void); void config_finish(struct grecs_node *tree); int run_config_finish_hooks(void); struct eclat_command_env { struct eclat_command const *cmd; CURL *curl; - struct ec2_query *query; + struct ec2_request *request; }; typedef struct eclat_command_env eclat_command_env_t; typedef int (*eclat_command_handler_t) (eclat_command_env_t *env, int argc, char **argv); @@ -177,18 +177,18 @@ int eclat_lsattr(eclat_command_env_t *env, int argc, char **argv); char *region_to_endpoint(const char *region); void define_format(const char *name, const char *format, grecs_locus_t *locus); void set_command_format(const char *name, const char *format, grecs_locus_t *locus); -void describe_query_create(eclat_command_env_t *env, int argc, char **argv, +void describe_request_create(eclat_command_env_t *env, int argc, char **argv, const char *uparm); -void describe_query_update(eclat_command_env_t *env, int argc, char **argv, +void describe_request_update(eclat_command_env_t *env, int argc, char **argv, const char *uparm, int n_in, int *n_out); -int eclat_send_query(CURL *curl, struct ec2_query *q); +int eclat_send_request(CURL *curl, struct ec2_request *q); char *eclat_get_instance_zone(void); void eclat_get_instance_creds(char *id, char **access_key_ptr, char **secret_key_ptr, char **token_ptr); int eclat_actcmp(const char *a, const char *b); @@ -227,13 +227,13 @@ int get_scr_cols(void); #define MAP_VOLUME "VolumeId" #define MAP_AZ "AZ" #define MAP_REG "reg" void translate_ids(int argc, char **argv, const char *map); void translate_resource_ids(int argc, char **argv); -void eclat_encode_devmap(struct ec2_query *q, struct grecs_list *list); +void eclat_encode_devmap(struct ec2_request *q, struct grecs_list *list); int get_access_creds(const char *id, char **access_key_ptr, char **secret_key_ptr); void define_format(const char *name, const char *fmt, grecs_locus_t *loc); forlan_eval_env_t find_format(const char *name); diff --git a/src/getconout.c b/src/getconout.c index 28527d7..f294866 100644 --- a/src/getconout.c +++ b/src/getconout.c @@ -32,9 +32,9 @@ eclat_get_console_output(eclat_command_env_t *env, int argc, char **argv) if (i == 0) die(EX_USAGE, "not enough arguments"); else if (i > 1) die(EX_USAGE, "only one argument is allowed"); translate_ids(argc, argv, MAP_INSTANCE); - describe_query_create(env, argc, argv, "InstanceId"); + describe_request_create(env, argc, argv, "InstanceId"); return 0; } diff --git a/src/lsaattr.c b/src/lsaattr.c index b3c729a..9ab8547 100644 --- a/src/lsaattr.c +++ b/src/lsaattr.c @@ -28,13 +28,13 @@ static char *attrs[] = { }; int eclat_describe_image_attribute(eclat_command_env_t *env, int argc, char **argv) { int i; - struct ec2_query *q = env->query; + struct ec2_request *q = env->request; const char *attrname; generic_proginfo->args_doc = "AMI-ID [ATTR]"; available_attrs = attrs; generic_proginfo->print_help_hook = list_attrs; generic_parse_options(env->cmd, @@ -53,11 +53,11 @@ eclat_describe_image_attribute(eclat_command_env_t *env, int argc, char **argv) break; case 1: attrname = attrs[0]; } translate_ids(1, argv, MAP_IMAGE); - eclat_query_add_param(q, "ImageId", argv[0]); - eclat_query_add_param(q, "Attribute", attrname); + eclat_request_add_param(q, "ImageId", argv[0]); + eclat_request_add_param(q, "Attribute", attrname); return 0; } diff --git a/src/lsaddr.c b/src/lsaddr.c index e008856..edc9729 100644 --- a/src/lsaddr.c +++ b/src/lsaddr.c @@ -24,10 +24,10 @@ eclat_describe_addresses(eclat_command_env_t *env, int argc, char **argv) int i; parse_options(env, argc, argv, &i); argv += i; argc -= i; - describe_query_create(env, argc, argv, + describe_request_create(env, argc, argv, vpc ? "AllocationId" : "PublicIp"); return 0; } diff --git a/src/lsiattr.c b/src/lsiattr.c index 62b1dfb..6301588 100644 --- a/src/lsiattr.c +++ b/src/lsiattr.c @@ -33,13 +33,13 @@ static char *attrs[] = { }; int eclat_describe_instance_attribute(eclat_command_env_t *env, int argc, char **argv) { int i; - struct ec2_query *q = env->query; + struct ec2_request *q = env->request; char *attrname; generic_proginfo->args_doc = "INST-ID ATTR"; available_attrs = attrs; generic_proginfo->print_help_hook = list_attrs; generic_parse_options(env->cmd, @@ -53,11 +53,11 @@ eclat_describe_instance_attribute(eclat_command_env_t *env, int argc, char **arg translate_ids(1, argv, MAP_INSTANCE); attrname = canonattrname(attrs, argv[1], NULL, NULL); if (!attrname) die(EX_USAGE, "unrecognized attribute name"); - eclat_query_add_param(q, "InstanceId", argv[0]); - eclat_query_add_param(q, "Attribute", attrname); + eclat_request_add_param(q, "InstanceId", argv[0]); + eclat_request_add_param(q, "Attribute", attrname); return 0; } diff --git a/src/lsimg-cl.opt b/src/lsimg-cl.opt index 9d3a026..5bde0d1 100644 --- a/src/lsimg-cl.opt +++ b/src/lsimg-cl.opt @@ -21,34 +21,34 @@ ECLAT_CL_BEGIN([<describe Amazon images>], [<[FILTER...] [AMI...]>]) OPTION(all,a,, [<describe all images>]) BEGIN grecs_asprintf(&bufptr, &bufsize, "Owner.%d", ++owner_n); - eclat_query_add_param(q, bufptr, "all"); + eclat_request_add_param(q, bufptr, "all"); END OPTION(owner,u,[<ID|amazon|aws-marketplace|self|all>], [<select AMIs with a particular owner>]) BEGIN grecs_asprintf(&bufptr, &bufsize, "Owner.%d", ++owner_n); - eclat_query_add_param(q, bufptr, optarg); + eclat_request_add_param(q, bufptr, optarg); END OPTION(executable-by, x, [<ID|all|self>], [<select images executable by the given user>]) BEGIN grecs_asprintf(&bufptr, &bufsize, "ExecutableBy.%d", ++xby_n); - eclat_query_add_param(q, bufptr, optarg); + eclat_request_add_param(q, bufptr, optarg); END ECLAT_CL_END ECLAT_CL_PARSER(parse_options,[<int argc, char *argv[], int *idx>], [< { - struct ec2_query *q = env->query; + struct ec2_request *q = env->request; char *bufptr = NULL; size_t bufsize = 0; static char *arch[] = { "i386", "x86_64", NULL }; static char *voltype[] = { "standard", "io1", NULL }; static char *imgtype[] = { "machine", "kernel", "ramdisk", NULL }; static char *prodcode[] = { "devpay", "marketplace", NULL }; diff --git a/src/lsimg.c b/src/lsimg.c index 4129a1e..2a2776c 100644 --- a/src/lsimg.c +++ b/src/lsimg.c @@ -25,10 +25,10 @@ eclat_describe_images(eclat_command_env_t *env, int argc, char **argv) parse_options(env, argc, argv, &i); argc -= i; argv += i; translate_ids(argc, argv, MAP_IMAGE); - describe_query_create(env, argc, argv, "ImageId"); + describe_request_create(env, argc, argv, "ImageId"); return 0; } diff --git a/src/lsinst.c b/src/lsinst.c index ccf433f..7c65495 100644 --- a/src/lsinst.c +++ b/src/lsinst.c @@ -144,9 +144,9 @@ eclat_describe_instances(eclat_command_env_t *env, int argc, char **argv) parse_options(env->cmd, argc, argv, &i); argv += i; argc -= i; translate_ids(argc, argv, MAP_INSTANCE); - describe_query_create(env, argc, argv, "InstanceId"); + describe_request_create(env, argc, argv, "InstanceId"); return 0; } diff --git a/src/lsistat.c b/src/lsistat.c index 3638db7..3866384 100644 --- a/src/lsistat.c +++ b/src/lsistat.c @@ -25,12 +25,12 @@ eclat_describe_instance_status(eclat_command_env_t *env, int argc, char **argv) parse_options(env, argc, argv, &i); argv += i; argc -= i; translate_ids(argc, argv, MAP_INSTANCE); - describe_query_create(env, argc, argv, "InstanceId"); + describe_request_create(env, argc, argv, "InstanceId"); if (all_option) - eclat_query_add_param(env->query, "IncludeAllInstances", "1"); + eclat_request_add_param(env->request, "IncludeAllInstances", "1"); return 0; } diff --git a/src/lsreg.c b/src/lsreg.c index 94acf86..11c8203 100644 --- a/src/lsreg.c +++ b/src/lsreg.c @@ -41,9 +41,9 @@ eclat_describe_regions(eclat_command_env_t *env, int argc, char **argv) parse_options(env->cmd, argc, argv, &i); argv += i; argc -= i; translate_ids(argc, argv, MAP_REG); - describe_query_create(env, argc, argv, "RegionName"); + describe_request_create(env, argc, argv, "RegionName"); return 0; } diff --git a/src/lssattr.c b/src/lssattr.c index febf425..66ed07f 100644 --- a/src/lssattr.c +++ b/src/lssattr.c @@ -24,13 +24,13 @@ static char *attrs[] = { int eclat_describe_snapshot_attribute(eclat_command_env_t *env, int argc, char **argv) { int i; - struct ec2_query *q = env->query; + struct ec2_request *q = env->request; const char *attrname; generic_proginfo->args_doc = "SNAP-ID [ATTR]"; available_attrs = attrs; generic_proginfo->print_help_hook = list_attrs; generic_parse_options(env->cmd, @@ -49,14 +49,14 @@ eclat_describe_snapshot_attribute(eclat_command_env_t *env, break; case 1: attrname = attrs[0]; } translate_ids(1, argv, MAP_SNAPSHOT); - eclat_query_add_param(q, "SnapshotId", argv[0]); - eclat_query_add_param(q, "Attribute", attrname); + eclat_request_add_param(q, "SnapshotId", argv[0]); + eclat_request_add_param(q, "Attribute", attrname); return 0; } static void remdash(char *p) { @@ -76,13 +76,13 @@ remdash(char *p) int eclat_modify_snapshot_attribute(eclat_command_env_t *env, int argc, char **argv) { int i; - struct ec2_query *q = env->query; + struct ec2_request *q = env->request; char *bufptr = NULL; size_t bufsize = 0; generic_proginfo->args_doc = "{g|u}{-|+}{all|ID} SNAP-ID"; generic_parse_options(env->cmd, "modify the createVolumePermission attribute of a snapshot", @@ -120,40 +120,40 @@ eclat_modify_snapshot_attribute(eclat_command_env_t *env, grecs_asprintf(&bufptr, &bufsize, "CreateVolumePermission.%s.%d.%s", action, i + 1, what); if (argv[i][0] == 'u') remdash(argv[i] + 2); - eclat_query_add_param(q, bufptr, argv[i] + 2); + eclat_request_add_param |