From daae7b2e4fbcecbb11f85949358c189fc25291b6 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Sat, 9 Feb 2013 15:34:03 +0200 Subject: 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. --- src/util.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/util.c') diff --git a/src/util.c b/src/util.c index 8925c9f..22696d9 100644 --- a/src/util.c +++ b/src/util.c @@ -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) { -- cgit v1.2.1