rerere.c: use error_errno() and warning_errno()

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/rerere.c b/rerere.c
index 587b7e2717b14748b92a5960f79947b5fba088f0..9e9c66ca02627bcb249e9c90dfd68481d412975e 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -351,8 +351,7 @@ static int handle_file(const char *path, unsigned char *sha1, const char *output
                error("There were errors while writing %s (%s)",
                      path, strerror(io.io.wrerror));
        if (io.io.output && fclose(io.io.output))
                error("There were errors while writing %s (%s)",
                      path, strerror(io.io.wrerror));
        if (io.io.output && fclose(io.io.output))

-               io.io.wrerror = error("Failed to flush %s: %s",
-                                     path, strerror(errno));
+               io.io.wrerror = error_errno("Failed to flush %s", path);

 
        if (hunk_no < 0) {
                if (output)
 
        if (hunk_no < 0) {
                if (output)


@@ -614,20 +613,17 @@ static int merge(const struct rerere_id *id, const char *path)
         * Mark that "postimage" was used to help gc.
         */
        if (utime(rerere_path(id, "postimage"), NULL) < 0)
         * Mark that "postimage" was used to help gc.
         */
        if (utime(rerere_path(id, "postimage"), NULL) < 0)

-               warning("failed utime() on %s: %s",
-                       rerere_path(id, "postimage"),
-                       strerror(errno));
+               warning_errno("failed utime() on %s",
+                             rerere_path(id, "postimage"));

 
        /* Update "path" with the resolution */
        f = fopen(path, "w");
        if (!f)
 
        /* Update "path" with the resolution */
        f = fopen(path, "w");
        if (!f)

-               return error("Could not open %s: %s", path,
-                            strerror(errno));
+               return error_errno("Could not open %s", path);

        if (fwrite(result.ptr, result.size, 1, f) != 1)
        if (fwrite(result.ptr, result.size, 1, f) != 1)

-               error("Could not write %s: %s", path, strerror(errno));
+               error_errno("Could not write %s", path);

        if (fclose(f))
        if (fclose(f))

-               return error("Writing %s failed: %s", path,
-                            strerror(errno));
+               return error_errno("Writing %s failed", path);

 
 out:
        free(cur.ptr);
 
 out:
        free(cur.ptr);


@@ -842,7 +838,7 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr)
        if (unlink(filename))
                return (errno == ENOENT
                        ? error("no remembered resolution for %s", path)
        if (unlink(filename))
                return (errno == ENOENT
                        ? error("no remembered resolution for %s", path)

-                       : error("cannot unlink %s: %s", filename, strerror(errno)));
+                       : error_errno("cannot unlink %s", filename));

 
        /*
         * Update the preimage so that the user can resolve the
 
        /*
         * Update the preimage so that the user can resolve the