@@ -115,7 +115,7 @@ static bool made_tablespace_dirs = false;
115
115
static bool found_tablespace_dirs = false;
116
116
117
117
/* Progress counters */
118
- static uint64 totalsize ;
118
+ static uint64 totalsize_kb ;
119
119
static uint64 totaldone ;
120
120
static int tablespacecount ;
121
121
@@ -722,7 +722,7 @@ progress_report(int tablespacenum, const char *filename, bool force)
722
722
return ; /* Max once per second */
723
723
724
724
last_progress_report = now ;
725
- percent = totalsize ? (int ) ((totaldone / 1024 ) * 100 / totalsize ) : 0 ;
725
+ percent = totalsize_kb ? (int ) ((totaldone / 1024 ) * 100 / totalsize_kb ) : 0 ;
726
726
727
727
/*
728
728
* Avoid overflowing past 100% or the full size. This may make the total
@@ -732,8 +732,8 @@ progress_report(int tablespacenum, const char *filename, bool force)
732
732
*/
733
733
if (percent > 100 )
734
734
percent = 100 ;
735
- if (totaldone / 1024 > totalsize )
736
- totalsize = totaldone / 1024 ;
735
+ if (totaldone / 1024 > totalsize_kb )
736
+ totalsize_kb = totaldone / 1024 ;
737
737
738
738
/*
739
739
* Separate step to keep platform-dependent format code out of
@@ -742,7 +742,7 @@ progress_report(int tablespacenum, const char *filename, bool force)
742
742
*/
743
743
snprintf (totaldone_str , sizeof (totaldone_str ), INT64_FORMAT ,
744
744
totaldone / 1024 );
745
- snprintf (totalsize_str , sizeof (totalsize_str ), INT64_FORMAT , totalsize );
745
+ snprintf (totalsize_str , sizeof (totalsize_str ), INT64_FORMAT , totalsize_kb );
746
746
747
747
#define VERBOSE_FILENAME_LENGTH 35
748
748
if (verbose )
@@ -1942,11 +1942,11 @@ BaseBackup(void)
1942
1942
/*
1943
1943
* Sum up the total size, for progress reporting
1944
1944
*/
1945
- totalsize = totaldone = 0 ;
1945
+ totalsize_kb = totaldone = 0 ;
1946
1946
tablespacecount = PQntuples (res );
1947
1947
for (i = 0 ; i < PQntuples (res ); i ++ )
1948
1948
{
1949
- totalsize += atol (PQgetvalue (res , i , 2 ));
1949
+ totalsize_kb += atol (PQgetvalue (res , i , 2 ));
1950
1950
1951
1951
/*
1952
1952
* Verify tablespace directories are empty. Don't bother with the
0 commit comments