John E. Malmberg convinced me to standardize on #ifs for defined

[rsync/rsync.git] / progress.c

diff --git a/progress.c b/progress.c
index 0cb5060..22e0955 100644 (file)
--- a/progress.c
+++ b/progress.c
@@ -26,6 +26,12 @@ extern int am_server;
 
 #define PROGRESS_HISTORY_SECS 5
 
+#ifdef GETPGRP_VOID
+#define GETPGRP_ARG
+#else
+#define GETPGRP_ARG 0
+#endif
+
 struct progress_history {
        struct timeval time;
        OFF_T ofs;
@@ -115,7 +121,7 @@ void end_progress(OFF_T size)
 void show_progress(OFF_T ofs, OFF_T size)
 {
        struct timeval now;
-#if HAVE_GETPGRP && HAVE_TCGETPGRP
+#if defined HAVE_GETPGRP && defined HAVE_TCGETPGRP
        static pid_t pgrp = -1;
        pid_t tc_pgrp;
 #endif
@@ -123,14 +129,9 @@ void show_progress(OFF_T ofs, OFF_T size)
        if (am_server)
                return;
 
-#if HAVE_GETPGRP && HAVE_TCGETPGRP
-       if (pgrp == -1) {
-# if GETPGRP_VOID
-               pgrp = getpgrp();
-# else
-               pgrp = getpgrp(0);
-# endif
-       }
+#if defined HAVE_GETPGRP && defined HAVE_TCGETPGRP
+       if (pgrp == -1)
+               pgrp = getpgrp(GETPGRP_ARG);
 #endif
 
        gettimeofday(&now, NULL);
@@ -164,7 +165,7 @@ void show_progress(OFF_T ofs, OFF_T size)
                ph_list[newest_hpos].ofs = ofs;
        }
 
-#if HAVE_GETPGRP && HAVE_TCGETPGRP
+#if defined HAVE_GETPGRP && defined HAVE_TCGETPGRP
        tc_pgrp = tcgetpgrp(STDOUT_FILENO);
        if (tc_pgrp != pgrp && tc_pgrp != -1)
                return;