write_file: drop "gently" form

There are no callers left of write_file_gently(). Let's drop
it, as it doesn't seem likely for new callers to be added
(since its inception, the only callers who wanted the gentle
form generally just died immediately themselves, and have
since been converted).

While we're there, let's also drop the "int" return from
write_file, as it is never meaningful (in the non-gentle
form, we always either die or return 0).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index 6049f867113896def34306f22ac6927b8f0e8e1e..3f6ae242dfd4a5c00c88bd918eb1436f66b580e3 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1734,8 +1734,7 @@ static inline ssize_t write_str_in_full(int fd, const char *str)
        return write_in_full(fd, str, strlen(str));
 }
 
        return write_in_full(fd, str, strlen(str));
 }
 

-extern int write_file(const char *path, const char *fmt, ...);
-extern int write_file_gently(const char *path, const char *fmt, ...);
+extern void write_file(const char *path, const char *fmt, ...);

 
 /* pager.c */
 extern void setup_pager(void);
 
 /* pager.c */
 extern void setup_pager(void);

diff --git a/wrapper.c b/wrapper.c
index 5dc4e15aa9bf73bb2ce0a7af1837e092e0cab585..0349441bde57eada06d1c7b99fa45d760a00b2a8 100644 (file)
--- a/wrapper.c
+++ b/wrapper.c
@@ -640,56 +640,24 @@ int xsnprintf(char *dst, size_t max, const char *fmt, ...)
        return len;
 }
 
        return len;
 }
 

-static int write_file_v(const char *path, int fatal,
-                       const char *fmt, va_list params)
+void write_file(const char *path, const char *fmt, ...)

 {
 {

+       va_list params;

        struct strbuf sb = STRBUF_INIT;
        int fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0666);
        struct strbuf sb = STRBUF_INIT;
        int fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0666);

-       if (fd < 0) {
-               if (fatal)
-                       die_errno(_("could not open %s for writing"), path);
-               return -1;
-       }
-       strbuf_vaddf(&sb, fmt, params);
-       strbuf_complete_line(&sb);
-       if (write_in_full(fd, sb.buf, sb.len) != sb.len) {
-               int err = errno;
-               close(fd);
-               strbuf_release(&sb);
-               errno = err;
-               if (fatal)
-                       die_errno(_("could not write to %s"), path);
-               return -1;
-       }
-       strbuf_release(&sb);
-       if (close(fd)) {
-               if (fatal)
-                       die_errno(_("could not close %s"), path);
-               return -1;
-       }
-       return 0;
-}
-
-int write_file(const char *path, const char *fmt, ...)
-{
-       int status;
-       va_list params;
+       if (fd < 0)
+               die_errno(_("could not open %s for writing"), path);

 
        va_start(params, fmt);
 
        va_start(params, fmt);

-       status = write_file_v(path, 1, fmt, params);
+       strbuf_vaddf(&sb, fmt, params);

        va_end(params);
        va_end(params);

-       return status;
-}
-
-int write_file_gently(const char *path, const char *fmt, ...)
-{
-       int status;
-       va_list params;

 
 

-       va_start(params, fmt);
-       status = write_file_v(path, 0, fmt, params);
-       va_end(params);
-       return status;
+       strbuf_complete_line(&sb);
+       if (write_in_full(fd, sb.buf, sb.len) != sb.len)
+               die_errno(_("could not write to %s"), path);
+       strbuf_release(&sb);
+       if (close(fd))
+               die_errno(_("could not close %s"), path);

 }
 
 void sleep_millisec(int millisec)
 }
 
 void sleep_millisec(int millisec)