diff options
| author | Russell Belfer <rb@github.com> | 2012-11-01 14:08:30 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2012-11-01 14:08:30 -0700 |
| commit | b90500f03d3ae60f1f79d7adb36d95632a29d7e5 (patch) | |
| tree | 6ca43785060429e23e891c3234ca171ad4cb2a95 /examples/diff.c | |
| parent | dbd6850d06111eb0761499d7c876ff7cd4ad57fa (diff) | |
| download | libgit2-b90500f03d3ae60f1f79d7adb36d95632a29d7e5.tar.gz | |
Improve docs, examples, warnings
This improves docs in some of the public header files, cleans
up and improves some of the example code, and fixes a couple
of pedantic warnings in places.
Diffstat (limited to 'examples/diff.c')
| -rw-r--r-- | examples/diff.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/examples/diff.c b/examples/diff.c index b72a75e1c..31ebf6bfb 100644 --- a/examples/diff.c +++ b/examples/diff.c @@ -3,7 +3,7 @@ #include <stdlib.h> #include <string.h> -void check(int error, const char *message) +static void check(int error, const char *message) { if (error) { fprintf(stderr, "%s (%d)\n", message, error); @@ -11,7 +11,8 @@ void check(int error, const char *message) } } -int resolve_to_tree(git_repository *repo, const char *identifier, git_tree **tree) +static int resolve_to_tree( + git_repository *repo, const char *identifier, git_tree **tree) { int err = 0; size_t len = strlen(identifier); @@ -61,16 +62,18 @@ char *colors[] = { "\033[36m" /* cyan */ }; -int printer( +static int printer( void *data, - git_diff_delta *delta, - git_diff_range *range, + const git_diff_delta *delta, + const git_diff_range *range, char usage, const char *line, size_t line_len) { int *last_color = data, color = 0; + (void)delta; (void)range; (void)line_len; + if (*last_color >= 0) { switch (usage) { case GIT_DIFF_LINE_ADDITION: color = 3; break; @@ -93,7 +96,7 @@ int printer( return 0; } -int check_uint16_param(const char *arg, const char *pattern, uint16_t *val) +static int check_uint16_param(const char *arg, const char *pattern, uint16_t *val) { size_t len = strlen(pattern); uint16_t strval; @@ -107,7 +110,7 @@ int check_uint16_param(const char *arg, const char *pattern, uint16_t *val) return 1; } -int check_str_param(const char *arg, const char *pattern, char **val) +static int check_str_param(const char *arg, const char *pattern, char **val) { size_t len = strlen(pattern); if (strncmp(arg, pattern, len)) @@ -116,7 +119,7 @@ int check_str_param(const char *arg, const char *pattern, char **val) return 1; } -void usage(const char *message, const char *arg) +static void usage(const char *message, const char *arg) { if (message && arg) fprintf(stderr, "%s: %s\n", message, arg); @@ -128,14 +131,15 @@ void usage(const char *message, const char *arg) int main(int argc, char *argv[]) { - char path[GIT_PATH_MAX]; git_repository *repo = NULL; git_tree *t1 = NULL, *t2 = NULL; - git_diff_options opts = {0}; + git_diff_options opts; git_diff_list *diff; int i, color = -1, compact = 0, cached = 0; char *a, *dir = ".", *treeish1 = NULL, *treeish2 = NULL; + memset(&opts, 0, sizeof(opts)); + /* parse arguments as copied from git-diff */ for (i = 1; i < argc; ++i) { |