Got rid of some unused externs.

[rsync.git] / cleanup.c

diff --git a/cleanup.c b/cleanup.c
index ca7e35463240c9424fc76fd6a3f4981a9f719369..78c048a4dc5fc76f84c485ca1278584b8309aa69 100644 (file)
--- a/cleanup.c
+++ b/cleanup.c
@@ -99,7 +99,7 @@ void _exit_cleanup(int code, const char *file, int line)
 
        if (verbose > 3) {
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
-                       code, file, line);
+                       code, safe_fname(file), line);
        }
 
        if (cleanup_child_pid != -1) {
@@ -136,10 +136,12 @@ void _exit_cleanup(int code, const char *file, int line)
        }
 
        if (code == 0) {
-               if ((io_error & ~IOERR_VANISHED) || log_got_error)
-                       code = RERR_PARTIAL;
-               else if (io_error)
+               if (io_error & IOERR_DEL_LIMIT)
+                       code = RERR_DEL_LIMIT;
+               if (io_error & IOERR_VANISHED)
                        code = RERR_VANISHED;
+               if (io_error & IOERR_GENERAL || log_got_error)
+                       code = RERR_PARTIAL;
        }
 
        if (code)
@@ -147,7 +149,7 @@ void _exit_cleanup(int code, const char *file, int line)
 
        if (verbose > 2) {
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
-                       ocode, file, line, code);
+                       ocode, safe_fname(file), line, code);
        }
 
        close_all();