Got rid of calls to (the soon to vanish) safe_fname() function.

[rsync/rsync.git] / cleanup.c

diff --git a/cleanup.c b/cleanup.c
index 78c048a..bb589e4 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, safe_fname(file), line);
+                       code, file, line);
        }
 
        if (cleanup_child_pid != -1) {
@@ -149,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, safe_fname(file), line, code);
+                       ocode, file, line, code);
        }
 
        close_all();
@@ -166,7 +166,7 @@ void cleanup_disable(void)
 void cleanup_set(char *fnametmp, char *fname, struct file_struct *file,
                 int fd_r, int fd_w)
 {
-       cleanup_fname = fnametmp;
+       cleanup_fname = fname ? fnametmp : NULL;
        cleanup_new_fname = fname;
        cleanup_file = file;
        cleanup_fd_r = fd_r;