Clean up stripspace a bit, use strbuf even more.

diff --git a/builtin-blame.c b/builtin-blame.c
index 1b1e6da85317200bd73e44071498fbf83d127487..16c0ca82063b35651cacc56b20ebd73c3526acfb 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -18,7 +18,6 @@
 #include "cache-tree.h"
 #include "path-list.h"
 #include "mailmap.h"
-#include "strbuf.h"
 
 static char blame_usage[] =
 "git-blame [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [--contents <filename>] [--incremental] [commit] [--] file\n"
@@ -1431,8 +1430,7 @@ static void get_commit_info(struct commit *commit,
 static void write_filename_info(const char *path)
 {
        printf("filename ");
-       write_name_quoted(NULL, 0, path, 1, stdout);
-       putchar('\n');
+       write_name_quoted(path, stdout, '\n');
 }
 
 /*
@@ -2023,7 +2021,7 @@ static struct commit *fake_working_tree_commit(const char *path, const char *con
 
        origin = make_origin(commit, path);
 
-       strbuf_init(&buf);
+       strbuf_init(&buf, 0);
        if (!contents_from || strcmp("-", contents_from)) {
                struct stat st;
                const char *read_from;
@@ -2046,7 +2044,7 @@ static struct commit *fake_working_tree_commit(const char *path, const char *con
                        fd = open(read_from, O_RDONLY);
                        if (fd < 0)
                                die("cannot open %s", read_from);
-                       if (strbuf_read(&buf, fd) != xsize_t(st.st_size))
+                       if (strbuf_read(&buf, fd, 0) != xsize_t(st.st_size))
                                die("cannot read %s", read_from);
                        break;
                case S_IFLNK:
@@ -2062,7 +2060,7 @@ static struct commit *fake_working_tree_commit(const char *path, const char *con
                /* Reading from stdin */
                contents_from = "standard input";
                mode = 0;
-               if (strbuf_read(&buf, 0) < 0)
+               if (strbuf_read(&buf, 0, 0) < 0)
                        die("read error %s from stdin", strerror(errno));
        }
        origin->file.ptr = buf.buf;