github-mirror/libarchive
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: Remove 'Error : ' prefix in lafe_errc calls

Browse Source 
Only a minority of calls to lafe_errc state explicitly that an error
occurred. Remove these few cases for a more unified argument handling.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
This commit is contained in:
Tobias Stoeckmann committed 2026-03-16 14:01:56 +01:00
1 parent f59ed04545
commit c24fa12410
3 files changed
+13 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tar/bsdtar.c
+9 -9
View File
@@ -525,28 +525,28 @@ main(int argc, char **argv)
if (archive_match_include_date(bsdtar->matching,
ARCHIVE_MATCH_CTIME | ARCHIVE_MATCH_NEWER,
bsdtar->argument) != ARCHIVE_OK)
lafe_errc(1, 0, "Error : %s",
lafe_errc(1, 0, "%s",
archive_error_string(bsdtar->matching));
break;
case OPTION_NEWER_CTIME_THAN:
if (archive_match_include_file_time(bsdtar->matching,
ARCHIVE_MATCH_CTIME | ARCHIVE_MATCH_NEWER,
bsdtar->argument) != ARCHIVE_OK)
lafe_errc(1, 0, "Error : %s",
lafe_errc(1, 0, "%s",
archive_error_string(bsdtar->matching));
break;
case OPTION_NEWER_MTIME: /* GNU tar */
if (archive_match_include_date(bsdtar->matching,
ARCHIVE_MATCH_MTIME | ARCHIVE_MATCH_NEWER,
bsdtar->argument) != ARCHIVE_OK)
lafe_errc(1, 0, "Error : %s",
lafe_errc(1, 0, "%s",
archive_error_string(bsdtar->matching));
break;
case OPTION_NEWER_MTIME_THAN:
if (archive_match_include_file_time(bsdtar->matching,
ARCHIVE_MATCH_MTIME | ARCHIVE_MATCH_NEWER,
bsdtar->argument) != ARCHIVE_OK)
lafe_errc(1, 0, "Error : %s",
lafe_errc(1, 0, "%s",
archive_error_string(bsdtar->matching));
break;
case OPTION_NODUMP: /* star */
@@ -618,28 +618,28 @@ main(int argc, char **argv)
if (archive_match_include_date(bsdtar->matching,
ARCHIVE_MATCH_CTIME | ARCHIVE_MATCH_OLDER,
bsdtar->argument) != ARCHIVE_OK)
lafe_errc(1, 0, "Error : %s",
lafe_errc(1, 0, "%s",
archive_error_string(bsdtar->matching));
break;
case OPTION_OLDER_CTIME_THAN:
if (archive_match_include_file_time(bsdtar->matching,
ARCHIVE_MATCH_CTIME | ARCHIVE_MATCH_OLDER,
bsdtar->argument) != ARCHIVE_OK)
lafe_errc(1, 0, "Error : %s",
lafe_errc(1, 0, "%s",
archive_error_string(bsdtar->matching));
break;
case OPTION_OLDER_MTIME:
if (archive_match_include_date(bsdtar->matching,
ARCHIVE_MATCH_MTIME | ARCHIVE_MATCH_OLDER,
bsdtar->argument) != ARCHIVE_OK)
lafe_errc(1, 0, "Error : %s",
lafe_errc(1, 0, "%s",
archive_error_string(bsdtar->matching));
break;
case OPTION_OLDER_MTIME_THAN:
if (archive_match_include_file_time(bsdtar->matching,
ARCHIVE_MATCH_MTIME | ARCHIVE_MATCH_OLDER,
bsdtar->argument) != ARCHIVE_OK)
lafe_errc(1, 0, "Error : %s",
lafe_errc(1, 0, "%s",
archive_error_string(bsdtar->matching));
break;
case OPTION_ONE_FILE_SYSTEM: /* GNU tar */
@@ -819,7 +819,7 @@ main(int argc, char **argv)
if (archive_match_exclude_pattern_from_file(
bsdtar->matching, bsdtar->argument, 0)
!= ARCHIVE_OK)
lafe_errc(1, 0, "Error : %s",
lafe_errc(1, 0, "%s",
archive_error_string(bsdtar->matching));
break;
case 'x': /* SUSv2 */
tar/write.c
+1 -1
View File
@@ -399,7 +399,7 @@ tar_mode_u(struct bsdtar *bsdtar)
if (archive_match_exclude_entry(bsdtar->matching,
ARCHIVE_MATCH_MTIME | ARCHIVE_MATCH_OLDER |
ARCHIVE_MATCH_EQUAL, entry) != ARCHIVE_OK)
lafe_errc(1, 0, "Error : %s",
lafe_errc(1, 0, "%s",
archive_error_string(bsdtar->matching));
/* Record the last format determination we see */
format = archive_format(a);