Make case_N.h more generic.
[rsync.git] / cleanup.c
index dc18f72af9a36af3c5e38f5661c9c2f3bb6e80fe..cf5f2122b3745d8abb42ec3239826bca5712fb31 100644 (file)
--- a/cleanup.c
+++ b/cleanup.c
@@ -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);