diff options
| author | Wayne Davison <wayned@samba.org> | 2010-08-26 10:13:04 -0700 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2010-08-26 11:13:02 -0700 |
| commit | 020df16defa3a25b7f227430a427873f3b944d26 (patch) | |
| tree | b88481d9fd316cf807b6bc8dc032bf461d64fcda /cleanup.c | |
| parent | 2624e005e2c2407c8e108230e6615d2aaba42617 (diff) | |
| download | rsync-020df16defa3a25b7f227430a427873f3b944d26.tar.gz | |
Make case_N.h more generic.
Diffstat (limited to 'cleanup.c')
| -rw-r--r-- | cleanup.c | 14 |
1 files changed, 11 insertions, 3 deletions
@@ -98,7 +98,7 @@ pid_t cleanup_child_pid = -1; **/ NORETURN void _exit_cleanup(int code, const char *file, int line) { - static int cleanup_step = 0; + static int switch_step = 0; static int exit_code = 0, exit_line = 0; static const char *exit_file = NULL; static int unmodified_code = 0; @@ -119,8 +119,9 @@ NORETURN void _exit_cleanup(int code, const char *file, int line) /* Some of our actions might cause a recursive call back here, so we * keep track of where we are in the cleanup and never repeat a step. */ - switch (cleanup_step) { -#include "case_N.h" /* case 0: cleanup_step++; */ + switch (switch_step) { +#include "case_N.h" /* case 0: */ + switch_step++; exit_code = unmodified_code = code; exit_file = file; @@ -139,6 +140,7 @@ NORETURN void _exit_cleanup(int code, const char *file, int line) /* FALLTHROUGH */ #include "case_N.h" + switch_step++; if (cleanup_child_pid != -1) { int status; @@ -152,6 +154,7 @@ NORETURN void _exit_cleanup(int code, const char *file, int line) /* FALLTHROUGH */ #include "case_N.h" + switch_step++; if (cleanup_got_literal && cleanup_fname && cleanup_new_fname && keep_partial && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) { @@ -169,12 +172,14 @@ NORETURN void _exit_cleanup(int code, const char *file, int line) /* FALLTHROUGH */ #include "case_N.h" + switch_step++; if (!code || am_server || am_receiver) io_flush(FULL_FLUSH); /* FALLTHROUGH */ #include "case_N.h" + switch_step++; if (cleanup_fname) do_unlink(cleanup_fname); @@ -203,6 +208,7 @@ NORETURN void _exit_cleanup(int code, const char *file, int line) /* FALLTHROUGH */ #include "case_N.h" + switch_step++; if (DEBUG_GTE(EXIT, 1)) { rprintf(FINFO, @@ -213,6 +219,7 @@ NORETURN void _exit_cleanup(int code, const char *file, int line) /* FALLTHROUGH */ #include "case_N.h" + switch_step++; if (exit_code && exit_code != RERR_SOCKETIO && exit_code != RERR_STREAMIO && exit_code != RERR_SIGNAL1 && exit_code != RERR_TIMEOUT && !shutting_down && (protocol_version >= 31 || am_receiver)) { @@ -228,6 +235,7 @@ NORETURN void _exit_cleanup(int code, const char *file, int line) /* FALLTHROUGH */ #include "case_N.h" + switch_step++; if (am_server && code) msleep(100); |