git-merge: show usage if run without arguments

diff --git a/help.c b/help.c
index 7a7f7759e592208b4604b6987bce8be46c936882..0824c25226ad7b106e56d1b7c23fad40eed92749 100644 (file)
--- a/help.c
+++ b/help.c
@@ -14,7 +14,7 @@
 static int term_columns(void)
 {
        char *col_string = getenv("COLUMNS");
-       int n_cols = 0;
+       int n_cols;
 
        if (col_string && (n_cols = atoi(col_string)) > 0)
                return n_cols;
@@ -140,7 +140,7 @@ static void list_commands(const char *exec_path, const char *pattern)
                        continue;
 
                entlen = strlen(de->d_name);
-               if (has_extension(de->d_name, entlen, ".exe"))
+               if (has_extension(de->d_name, ".exe"))
                        entlen -= 4;
 
                if (longest < entlen)
@@ -184,7 +184,7 @@ static void show_man_page(const char *git_cmd)
                page = git_cmd;
        else {
                int page_len = strlen(git_cmd) + 4;
-               char *p = malloc(page_len + 1);
+               char *p = xmalloc(page_len + 1);
                strcpy(p, "git-");
                strcpy(p + 4, git_cmd);
                p[page_len] = 0;