diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-02-09 15:34:03 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-02-09 15:57:58 +0200 |
commit | daae7b2e4fbcecbb11f85949358c189fc25291b6 (patch) | |
tree | a9a3c8a4e8fb77f74f277639c25d28e66950a85b /src/util.c | |
parent | 0618216327920bc87032948daea267f247db317a (diff) | |
download | eclat-daae7b2e4fbcecbb11f85949358c189fc25291b6.tar.gz eclat-daae7b2e4fbcecbb11f85949358c189fc25291b6.tar.bz2 |
Make all tag-related subcommands accept the same set of options.
* src/dscrtags-cl.opt: New file.
* src/Makefile.am (OPTFILES): Add dscrtags-cl.opt
* src/cretags.c (process_tags): New parameter "require_tags".
All uses updated.
* src/dscrtags.c: Include dscrtags-cl.h.
(eclat_describe_tags): Accept the same set of arguments as
eclat_create_tags and eclat_delete_tags.
* src/eclat.h (describe_query_update): New proto.
* src/util.c (describe_query_update): New function.
(describe_query_create): Rewrite as an entry point
to describe_query_update.
* doc/eclat-delete-tags.1: Update.
* doc/eclat-describe-tags.1: Update
* grecs: Upgrade
* src/dscrsnapattr.c (eclat_modify_snapshot_attribute)
(eclat_reset_snapshot_attribute): Remove unused locals.
Diffstat (limited to 'src/util.c')
-rw-r--r-- | src/util.c | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -149,8 +149,8 @@ get_scr_cols() void -describe_query_create(eclat_command_env_t *env, int argc, char **argv, - const char *uparm) +describe_query_update(eclat_command_env_t *env, int argc, char **argv, + const char *uparm, int n_in, int *n_out) { int i, j, k; struct ec2_query *q = env->query; @@ -162,7 +162,7 @@ describe_query_create(eclat_command_env_t *env, int argc, char **argv, ws.ws_delim = ","; wsflags = WRDSF_DEFFLAGS | WRDSF_DELIM; - for (i = 0, j = 1; i < argc; i++) { + for (i = 0, j = n_in; i < argc; i++) { char *p = strchr(argv[i], '='); if (!p) { if (uparm) { @@ -192,8 +192,17 @@ describe_query_create(eclat_command_env_t *env, int argc, char **argv, if (wsflags & WRDSF_REUSE) wordsplit_free(&ws); free(bufptr); + if (n_out) + *n_out = j; } +void +describe_query_create(eclat_command_env_t *env, int argc, char **argv, + const char *uparm) +{ + describe_query_update(env, argc, argv, uparm, 1, NULL); +} + int eclat_send_query(CURL *curl, struct ec2_query *q) { |