Fewer macros in common.h
In common.h, replace macros with constants or functions when that is easy. This makes code a bit more reliable (functions evaluate their args exactly once) and easier to debug (many debugging environments cannot access macros). * src/common.h (CHKBLANKS): Remove. All uses removed. (NAME_FIELD_SIZE, PREFIX_FIELD_SIZE, UNAME_FIELD_SIZE) (GNAME_FIELD_SIZE, TAREXIT_SUCCESS, TAREXIT_DIFFERS) (TAREXIT_FAILURE, LG_8, LG_256, DEFAULT_CHECKPOINT) (MAX_OLD_FILES, TF_READ, TF_WRITE, TF_DELETED, XFORM_REGFILE) (XFORM_LINK, XFORM_SYMLINK, XFORM_ALL, WARN_ALONE_ZERO_BLOCK) (WARN_BAD_DUMPDIR, WARN_CACHEDIR, WARN_CONTIGUOUS_CAST) (WARN_FILE_CHANGED, WARN_FILE_IGNORED, WARN_FILE_REMOVED) (WARN_FILE_SHRANK, WARN_FILE_UNCHANGED, WARN_FILENAME_WITH_NULS) (WARN_IGNORE_ARCHIVE, WARN_IGNORE_NEWER, WARN_NEW_DIRECTORY) (WARN_RENAME_DIRECTORY, WARN_SYMLINK_CAST, WARN_TIMESTAMP) (WARN_UNKNOWN_CAST, WARN_UNKNOWN_KEYWORD, WARN_XDEV) (WARN_DECOMPRESS_PROGRAM, WARN_EXISTING_FILE, WARN_XATTR_WRITE) (WARN_RECORD_SIZE, WARN_FAILED_READ, WARN_MISSING_ZERO_BLOCKS) (WARN_VERBOSE_WARNINGS, WARN_ALL, EXCL_DEFAULT, EXCL_RECURSIVE) (EXCL_NON_RECURSIVE): Now enum constants rather than macros. (time_option_initialized, isfound, wasfound, warning_enabled): Now functions rather than macros TIME_OPTION_INITIALIZED, ISFOUND, WASFOUND, WARNING_ENABLED. All uses changed. (OLDER_STAT_TIME, OLDER_TAR_STAT_TIME, EXTRACT_OVER_PIPE) (TAR_ARGS_INITIALIZER): Remove. All uses replaced with their definiens or equivalent.
This commit is contained in:
@@ -1768,7 +1768,7 @@ prepare_to_extract (char const *file_name, int typeflag, tar_extractor_t *fun)
|
||||
extractor = extract_file;
|
||||
}
|
||||
|
||||
if (EXTRACT_OVER_PIPE)
|
||||
if (to_stdout_option || to_command_option)
|
||||
{
|
||||
if (extractor != extract_file)
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user