summaryrefslogtreecommitdiff
path: root/builtin-count-objects.c
diff options
context:
space:
mode:
authorPierre Habouzit <madcoder@debian.org>2007-10-15 20:38:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-10-30 04:03:31 (GMT)
commit833f3abd821434fd9b12d6cea66f04f232479c22 (patch)
tree36ae7195468d6ad1aa53a52a921c59192b5ec12e /builtin-count-objects.c
parent5ac0a2063e8f824f6e8ffb4d18de74c55aae7131 (diff)
downloadgit-833f3abd821434fd9b12d6cea66f04f232479c22.zip
git-833f3abd821434fd9b12d6cea66f04f232479c22.tar.gz
git-833f3abd821434fd9b12d6cea66f04f232479c22.tar.bz2
Make builtin-count-objects.c use parse_options.
Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'builtin-count-objects.c')
-rw-r--r--builtin-count-objects.c32
1 files changed, 15 insertions, 17 deletions
diff --git a/builtin-count-objects.c b/builtin-count-objects.c
index 4274ec1..f00306f 100644
--- a/builtin-count-objects.c
+++ b/builtin-count-objects.c
@@ -6,8 +6,7 @@
#include "cache.h"
#include "builtin.h"
-
-static const char count_objects_usage[] = "git-count-objects [-v]";
+#include "parse-options.h"
static void count_objects(DIR *d, char *path, int len, int verbose,
unsigned long *loose,
@@ -67,29 +66,28 @@ static void count_objects(DIR *d, char *path, int len, int verbose,
}
}
-int cmd_count_objects(int ac, const char **av, const char *prefix)
+static char const * const count_objects_usage[] = {
+ "git-count-objects [-v]",
+ NULL
+};
+
+int cmd_count_objects(int argc, const char **argv, const char *prefix)
{
- int i;
- int verbose = 0;
+ int i, verbose = 0;
const char *objdir = get_object_directory();
int len = strlen(objdir);
char *path = xmalloc(len + 50);
unsigned long loose = 0, packed = 0, packed_loose = 0, garbage = 0;
unsigned long loose_size = 0;
+ struct option opts[] = {
+ OPT__VERBOSE(&verbose),
+ OPT_END(),
+ };
- for (i = 1; i < ac; i++) {
- const char *arg = av[i];
- if (*arg != '-')
- break;
- else if (!strcmp(arg, "-v"))
- verbose = 1;
- else
- usage(count_objects_usage);
- }
-
+ argc = parse_options(argc, argv, opts, count_objects_usage, 0);
/* we do not take arguments other than flags for now */
- if (i < ac)
- usage(count_objects_usage);
+ if (argc)
+ usage_with_options(count_objects_usage, opts);
memcpy(path, objdir, len);
if (len && objdir[len-1] != '/')
path[len++] = '/';