diff options
| author | Jan Tulak <jtulak@redhat.com> | 2018-12-06 17:10:00 -0600 |
|---|---|---|
| committer | Eric Sandeen <sandeen@redhat.com> | 2018-12-06 17:10:00 -0600 |
| commit | fc342f7803580ff0c63c30129d2283991d186ba3 (patch) | |
| tree | 3393183c0984c8c25dfe575c0c84f70bc35a3845 | |
| parent | 354d07dd9b88c83cfbe285add796edfa1d3352a2 (diff) | |
| download | xfsdump-dev-fc342f7803580ff0c63c30129d2283991d186ba3.tar.gz | |
xfsdump: do not split function call with ifdef
In two files in xfsdump, a function call is split in half by an ifdef
macro to conditionally pick an argument at compile time. This causes the
code to be a bit less obvious and some analysis tools have trouble with
understanding it.
So, instead of splitting the function in half, move the whole function
call into each of the ifdef macros.
Signed-off-by: Jan Tulak <jtulak@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
| -rw-r--r-- | common/drive_minrmt.c | 3 | ||||
| -rw-r--r-- | common/main.c | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/common/drive_minrmt.c b/common/drive_minrmt.c index 59a40a75..04fed3e4 100644 --- a/common/drive_minrmt.c +++ b/common/drive_minrmt.c @@ -2585,11 +2585,12 @@ read_label( drive_t *drivep ) if (( nread == 0 ) /* takes care of sun */ || /* now handle SGI */ (nread < 0 && saved_errno == ENOSPC )) { - mlog( MLOG_NORMAL | MLOG_DRIVE, #ifdef DUMP + mlog( MLOG_NORMAL | MLOG_DRIVE, _("encountered EOD : assuming blank media\n") ); #endif #ifdef RESTORE + mlog( MLOG_NORMAL | MLOG_DRIVE, _("encountered EOD : end of data\n") ); #endif ( void )rewind_and_verify( drivep ); diff --git a/common/main.c b/common/main.c index b3605d15..0c23eb41 100644 --- a/common/main.c +++ b/common/main.c @@ -581,12 +581,14 @@ main( int argc, char *argv[] ) sigaction( SIGTERM, &sa, NULL ); sigaction( SIGQUIT, &sa, NULL ); +#ifdef DUMP ok = drive_init2( argc, argv, -#ifdef DUMP gwhdrtemplatep ); #endif /* DUMP */ #ifdef RESTORE + ok = drive_init2( argc, + argv, ( global_hdr_t * )0 ); #endif /* RESTORE */ if ( ! ok ) { @@ -629,12 +631,14 @@ main( int argc, char *argv[] ) * time-consuming chore. drive_init3 will synchronize with each slave. */ if ( ! init_error ) { +#ifdef DUMP ok = drive_init2( argc, argv, -#ifdef DUMP gwhdrtemplatep ); #endif /* DUMP */ #ifdef RESTORE + ok = drive_init2( argc, + argv, ( global_hdr_t * )0 ); #endif /* RESTORE */ if ( ! ok ) { |