From: Michele Ballabio <barra_cuda@katamail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH 3/9] builtin-prune-packed.c: use parse_options()
Date: Wed, 23 Jul 2008 23:42:06 +0200 [thread overview]
Message-ID: <1216849332-26813-4-git-send-email-barra_cuda@katamail.com> (raw)
In-Reply-To: <1216849332-26813-1-git-send-email-barra_cuda@katamail.com>
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
---
builtin-prune-packed.c | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c
index 10cb8df..5866871 100644
--- a/builtin-prune-packed.c
+++ b/builtin-prune-packed.c
@@ -1,12 +1,15 @@
#include "builtin.h"
#include "cache.h"
#include "progress.h"
+#include "parse-options.h"
-static const char prune_packed_usage[] =
-"git prune-packed [-n] [-q]";
+static const char * const prune_packed_usage[] = {
+ "git prune-packed [-n] [-q]",
+ NULL
+};
#define DRY_RUN 01
-#define VERBOSE 02
+#define QUIET 02
static struct progress *progress;
@@ -43,7 +46,7 @@ void prune_packed_objects(int opts)
const char *dir = get_object_directory();
int len = strlen(dir);
- if (opts == VERBOSE)
+ if (!opts)
progress = start_progress_delay("Removing duplicate objects",
256, 95, 2);
@@ -67,24 +70,19 @@ void prune_packed_objects(int opts)
int cmd_prune_packed(int argc, const char **argv, const char *prefix)
{
- int i;
- int opts = VERBOSE;
+ int opts = 0;
- for (i = 1; i < argc; i++) {
- const char *arg = argv[i];
+ const struct option options[] = {
+ OPT_BIT('n', "dry-run", &opts, "dry run", DRY_RUN),
+ OPT_BIT('q', "quiet", &opts, "be quiet", QUIET),
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, options, prune_packed_usage, 0);
+
+ if (argc > 0)
+ usage_with_options(prune_packed_usage, options);
- if (*arg == '-') {
- if (!strcmp(arg, "-n"))
- opts |= DRY_RUN;
- else if (!strcmp(arg, "-q"))
- opts &= ~VERBOSE;
- else
- usage(prune_packed_usage);
- continue;
- }
- /* Handle arguments here .. */
- usage(prune_packed_usage);
- }
prune_packed_objects(opts);
return 0;
}
--
1.5.6.3
next prev parent reply other threads:[~2008-07-23 21:37 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-23 21:42 [PATCH 0/9] Extend use of parse_options() Michele Ballabio
2008-07-23 21:42 ` [PATCH 1/9] builtin-verify-tag.c: use parse_options() Michele Ballabio
2008-07-24 16:59 ` Olivier Marin
2008-07-24 17:08 ` Johannes Schindelin
2008-07-25 15:20 ` Olivier Marin
2008-07-26 0:53 ` Johannes Schindelin
2008-07-28 10:48 ` [PATCH] builtin-verify-tag: fix -v option parsing Olivier Marin
2008-07-28 11:06 ` Johannes Schindelin
2008-07-28 11:42 ` Olivier Marin
2008-07-28 12:10 ` Johannes Schindelin
2008-07-23 21:42 ` [PATCH 2/9] builtin-write-tree.c: use parse_options() Michele Ballabio
2008-07-23 21:42 ` Michele Ballabio [this message]
2008-07-23 21:42 ` [PATCH 4/9] builtin-ls-tree.c: " Michele Ballabio
2008-07-23 21:42 ` [PATCH 5/9] builtin-rev-list.c: " Michele Ballabio
2008-07-23 21:42 ` [PATCH 6/9] builtin-init-db.c: " Michele Ballabio
2008-07-24 16:15 ` Olivier Marin
2008-07-24 17:07 ` Johannes Schindelin
2008-07-25 15:20 ` Olivier Marin
2008-07-26 0:55 ` Johannes Schindelin
2008-07-24 20:07 ` Michele Ballabio
2008-07-25 8:15 ` [PATCH 6/9 - v2] " Michele Ballabio
2008-07-25 15:20 ` [PATCH 6/9] " Olivier Marin
2008-07-25 19:53 ` [PATCH 6/9 - v3] " Michele Ballabio
2008-07-23 21:42 ` [PATCH 7/9] builtin-checkout-index.c: " Michele Ballabio
2008-07-24 14:44 ` Johannes Schindelin
2008-07-24 20:08 ` Michele Ballabio
2008-07-24 20:35 ` Sverre Rabbelier
2008-07-25 9:01 ` René Scharfe
2008-07-25 16:25 ` [PATCH 7/9 - v2] " Michele Ballabio
2008-07-23 21:42 ` [PATCH 8/9] builtin-fetch-pack.c: " Michele Ballabio
2008-07-23 21:42 ` [PATCH 9/9] builtin-mailinfo.c: " Michele Ballabio
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1216849332-26813-4-git-send-email-barra_cuda@katamail.com \
--to=barra_cuda@katamail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).