Commit fe477951be315e6fe28d6df9baf1557cef6fe539
2015-03-03T14:35:10
Merge pull request #2885 from JIghtuse/master describe example: function to add commits to opts
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/examples/describe.c b/examples/describe.c
index 72d9811..f7b4b1c 100644
--- a/examples/describe.c
+++ b/examples/describe.c
@@ -13,6 +13,7 @@
*/
#include "common.h"
+#include <assert.h>
/**
* The following example partially reimplements the `git describe` command
@@ -46,6 +47,27 @@ typedef struct {
typedef struct args_info args_info;
+static void *xrealloc(void *oldp, size_t newsz)
+{
+ void *p = realloc(oldp, newsz);
+ if (p == NULL) {
+ fprintf(stderr, "Cannot allocate memory, exiting.\n");
+ exit(1);
+ }
+ return p;
+}
+
+static void opts_add_commit(describe_options *opts, const char *commit)
+{
+ size_t sz;
+
+ assert(opts != NULL);
+
+ sz = ++opts->commit_count * sizeof(opts->commits[0]);
+ opts->commits = xrealloc(opts->commits, sz);
+ opts->commits[opts->commit_count - 1] = commit;
+}
+
static void do_describe_single(git_repository *repo, describe_options *opts, const char *rev)
{
git_object *commit;
@@ -96,9 +118,7 @@ static void parse_options(describe_options *opts, int argc, char **argv)
const char *curr = argv[args.pos];
if (curr[0] != '-') {
- size_t newsz = ++opts->commit_count * sizeof(opts->commits[0]);
- opts->commits = (const char **)realloc((void *)opts->commits, newsz);
- opts->commits[opts->commit_count - 1] = curr;
+ opts_add_commit(opts, curr);
} else if (!strcmp(curr, "--all")) {
opts->describe_options.describe_strategy = GIT_DESCRIBE_ALL;
} else if (!strcmp(curr, "--tags")) {
@@ -124,9 +144,7 @@ static void parse_options(describe_options *opts, int argc, char **argv)
}
else {
if (!opts->format_options.dirty_suffix || !opts->format_options.dirty_suffix[0]) {
- size_t sz = ++opts->commit_count * sizeof(opts->commits[0]);
- opts->commits = (const char **)malloc(sz);
- opts->commits[0] = "HEAD";
+ opts_add_commit(opts, "HEAD");
}
}
}