Fix clang warnings and improve checks

diff --git a/examples/network/fetch.c b/examples/network/fetch.c
index d5caad4de270fa286affb881e1895f89b3af0646..6020ec6ecc714db2b32b5f48d73e014d067cded1 100644 (file)
--- a/examples/network/fetch.c
+++ b/examples/network/fetch.c
@@ -16,7 +16,7 @@ struct dl_data {
 
 static void progress_cb(const char *str, int len, void *data)
 {
-       data = data;
+       (void)data;
        printf("remote: %.*s", len, str);
        fflush(stdout); /* We don't have the \n to force the flush */
 }
@@ -50,7 +50,7 @@ exit:
 static int update_cb(const char *refname, const git_oid *a, const git_oid *b, void *data)
 {
        char a_str[GIT_OID_HEXSZ+1], b_str[GIT_OID_HEXSZ+1];
-       data = data;
+       (void)data;
 
        git_oid_fmt(b_str, b);
        b_str[GIT_OID_HEXSZ] = '\0';
@@ -76,7 +76,11 @@ int fetch(git_repository *repo, int argc, char **argv)
        pthread_t worker;
 #endif
 
-       argc = argc;
+       if (argc < 2) {
+               fprintf(stderr, "usage: %s fetch <repo>\n", argv[-1]);
+               return EXIT_FAILURE;
+       }
+
        // Figure out whether it's a named remote or a URL
        printf("Fetching %s for repo %p\n", argv[1], repo);
        if (git_remote_load(&remote, repo, argv[1]) < 0) {

diff --git a/examples/network/index-pack.c b/examples/network/index-pack.c
index 3fc4f32885714f7c3ead3e062239dbb307c43f46..889305da82451681949ccf6b225da467c38e8ddc 100644 (file)
--- a/examples/network/index-pack.c
+++ b/examples/network/index-pack.c
@@ -23,7 +23,7 @@
 // the indexing to finish in a worker thread
 static int index_cb(const git_transfer_progress *stats, void *data)
 {
-       data = data;
+       (void)data;
        printf("\rProcessing %d of %d", stats->indexed_objects, stats->total_objects);
 
        return 0;
@@ -39,9 +39,10 @@ int index_pack(git_repository *repo, int argc, char **argv)
        ssize_t read_bytes;
        char buf[512];
 
-       repo = repo;
+       (void)repo;
+
        if (argc < 2) {
-               fprintf(stderr, "I need a packfile\n");
+               fprintf(stderr, "usage: %s index-pack <packfile>\n", argv[-1]);
                return EXIT_FAILURE;
        }
 

diff --git a/examples/network/ls-remote.c b/examples/network/ls-remote.c
index 737eeacd396e1bef445cd36098bf848f89530edc..25201182831037a1c1e2d957ad502d1486eec235 100644 (file)
--- a/examples/network/ls-remote.c
+++ b/examples/network/ls-remote.c
@@ -8,7 +8,7 @@ static int show_ref__cb(git_remote_head *head, void *payload)
 {
        char oid[GIT_OID_HEXSZ + 1] = {0};
 
-       payload = payload;
+       (void)payload;
        git_oid_fmt(oid, &head->oid);
        printf("%s\t%s\n", oid, head->name);
        return 0;
@@ -67,7 +67,11 @@ int ls_remote(git_repository *repo, int argc, char **argv)
 {
        int error;
 
-       argc = argc;
+       if (argc < 2) {
+               fprintf(stderr, "usage: %s ls-remote <remote>\n", argv[-1]);
+               return EXIT_FAILURE;
+       }
+
        /* If there's a ':' in the name, assume it's an URL */
        if (strchr(argv[1], ':') != NULL) {
                error = use_unnamed(repo, argv[1]);

diff --git a/src/date.c b/src/date.c
index bbf88eb44bb38f46d79f408c647637edf2d9bb30..ce1721a0b6be46b61c47578d86c04dfcd4c990b3 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -681,8 +681,8 @@ static const char *approxidate_alpha(const char *date, struct tm *tm, struct tm
        const char *end = date;
        int i;
 
-       while (isalpha(*++end));
-               ;
+       while (isalpha(*++end))
+               /* scan to non-alpha */;
 
        for (i = 0; i < 12; i++) {
                size_t match = match_string(date, month_names[i]);