Commit 9da187e8 by Russell Belfer

Fix clang warnings and improve checks

parent 94750e8a
...@@ -16,7 +16,7 @@ struct dl_data { ...@@ -16,7 +16,7 @@ struct dl_data {
static void progress_cb(const char *str, int len, void *data) static void progress_cb(const char *str, int len, void *data)
{ {
data = data; (void)data;
printf("remote: %.*s", len, str); printf("remote: %.*s", len, str);
fflush(stdout); /* We don't have the \n to force the flush */ fflush(stdout); /* We don't have the \n to force the flush */
} }
...@@ -50,7 +50,7 @@ exit: ...@@ -50,7 +50,7 @@ exit:
static int update_cb(const char *refname, const git_oid *a, const git_oid *b, void *data) 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]; char a_str[GIT_OID_HEXSZ+1], b_str[GIT_OID_HEXSZ+1];
data = data; (void)data;
git_oid_fmt(b_str, b); git_oid_fmt(b_str, b);
b_str[GIT_OID_HEXSZ] = '\0'; b_str[GIT_OID_HEXSZ] = '\0';
...@@ -76,7 +76,11 @@ int fetch(git_repository *repo, int argc, char **argv) ...@@ -76,7 +76,11 @@ int fetch(git_repository *repo, int argc, char **argv)
pthread_t worker; pthread_t worker;
#endif #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 // Figure out whether it's a named remote or a URL
printf("Fetching %s for repo %p\n", argv[1], repo); printf("Fetching %s for repo %p\n", argv[1], repo);
if (git_remote_load(&remote, repo, argv[1]) < 0) { if (git_remote_load(&remote, repo, argv[1]) < 0) {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
// the indexing to finish in a worker thread // the indexing to finish in a worker thread
static int index_cb(const git_transfer_progress *stats, void *data) 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); printf("\rProcessing %d of %d", stats->indexed_objects, stats->total_objects);
return 0; return 0;
...@@ -39,9 +39,10 @@ int index_pack(git_repository *repo, int argc, char **argv) ...@@ -39,9 +39,10 @@ int index_pack(git_repository *repo, int argc, char **argv)
ssize_t read_bytes; ssize_t read_bytes;
char buf[512]; char buf[512];
repo = repo; (void)repo;
if (argc < 2) { if (argc < 2) {
fprintf(stderr, "I need a packfile\n"); fprintf(stderr, "usage: %s index-pack <packfile>\n", argv[-1]);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
......
...@@ -8,7 +8,7 @@ static int show_ref__cb(git_remote_head *head, void *payload) ...@@ -8,7 +8,7 @@ static int show_ref__cb(git_remote_head *head, void *payload)
{ {
char oid[GIT_OID_HEXSZ + 1] = {0}; char oid[GIT_OID_HEXSZ + 1] = {0};
payload = payload; (void)payload;
git_oid_fmt(oid, &head->oid); git_oid_fmt(oid, &head->oid);
printf("%s\t%s\n", oid, head->name); printf("%s\t%s\n", oid, head->name);
return 0; return 0;
...@@ -67,7 +67,11 @@ int ls_remote(git_repository *repo, int argc, char **argv) ...@@ -67,7 +67,11 @@ int ls_remote(git_repository *repo, int argc, char **argv)
{ {
int error; 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 there's a ':' in the name, assume it's an URL */
if (strchr(argv[1], ':') != NULL) { if (strchr(argv[1], ':') != NULL) {
error = use_unnamed(repo, argv[1]); error = use_unnamed(repo, argv[1]);
......
...@@ -681,8 +681,8 @@ static const char *approxidate_alpha(const char *date, struct tm *tm, struct tm ...@@ -681,8 +681,8 @@ static const char *approxidate_alpha(const char *date, struct tm *tm, struct tm
const char *end = date; const char *end = date;
int i; int i;
while (isalpha(*++end)); while (isalpha(*++end))
; /* scan to non-alpha */;
for (i = 0; i < 12; i++) { for (i = 0; i < 12; i++) {
size_t match = match_string(date, month_names[i]); size_t match = match_string(date, month_names[i]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment