Skip to content

Commit a5857a3

Browse files
committed
Define exiso_warn macro, set 's_warned'
1 parent 3438285 commit a5857a3

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

extract-xiso.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,9 @@
423423
-v Print version information and exit.\n\
424424
", banner, argv[ 0 ], argv[ 0 ] );
425425

426-
#define exiso_log if ( ! s_quiet ) printf
427-
#define flush() if ( ! s_quiet ) fflush( stdout )
426+
#define exiso_log(...) if ( ! s_quiet ) { printf(__VA_ARGS__); }
427+
#define exiso_warn(...) if ( ! s_quiet ) { printf(__VA_ARGS__); s_warned = true; }
428+
#define flush() if ( ! s_quiet ) { fflush( stdout ); }
428429

429430
#define mem_err() { log_err( __FILE__, __LINE__, "out of memory error\n" ); err = 1; }
430431
#define read_err() { log_err( __FILE__, __LINE__, "read error: %s\n", strerror( errno ) ); err = 1; }
@@ -630,7 +631,7 @@ static bool s_real_quiet = false;
630631
static bool s_media_enable = true;
631632
static xoff_t s_total_bytes_all_isos = 0;
632633
static int s_total_files_all_isos = 0;
633-
static bool s_warned = 0;
634+
static bool s_warned = false;
634635

635636
static bool s_remove_systemupdate = false;
636637
static char *s_systemupdate = "$SystemUpdate";
@@ -1677,7 +1678,7 @@ int extract_file( int in_xiso, dir_node *in_file, modes in_mode , char* path) {
16771678
size = min(in_file->file_size - i, READWRITE_BUFFER_SIZE);
16781679
} while (i < in_file->file_size && read_size > 0);
16791680
if (!err && i < in_file->file_size) {
1680-
exiso_log("\nWARNING: File %s is truncated. Reported size: %u bytes, read size: %u bytes!", in_file->filename, in_file->file_size, i);
1681+
exiso_warn("\nWARNING: File %s is truncated. Reported size: %u bytes, read size: %u bytes!", in_file->filename, in_file->file_size, i);
16811682
in_file->file_size = i;
16821683
}
16831684
}
@@ -1826,7 +1827,7 @@ int write_file( dir_node_avl *in_avl, write_tree_context *in_context, int in_dep
18261827
exiso_log(err ? "failed\n" : "[OK]\n");
18271828

18281829
if (!err && i != in_avl->file_size) {
1829-
exiso_log("WARNING: File %s is truncated. Reported size: %u bytes, wrote size: %u bytes!\n", in_avl->filename, i, in_avl->file_size);
1830+
exiso_warn("WARNING: File %s is truncated. Reported size: %u bytes, wrote size: %u bytes!\n", in_avl->filename, i, in_avl->file_size);
18301831
}
18311832

18321833
if (!err) {

0 commit comments

Comments
 (0)