diff --git a/lrzip_private.h b/lrzip_private.h index d2ce1eb..e7cd109 100644 --- a/lrzip_private.h +++ b/lrzip_private.h @@ -452,7 +452,6 @@ struct rzip_control { const char *util_outfile; char delete_outfile; FILE *outputfile; - char library_mode; int log_level; void (*info_cb)(void *data, int pct, int chunk_pct); void *info_data; @@ -513,11 +512,7 @@ struct stream_info { static inline void __attribute__((format(printf, 6, 7))) print_stuff(const rzip_control *control, int level, unsigned int line, const char *file, const char *func, const char *format, ...) { va_list ap; - if (control->library_mode && control->log_cb && (control->log_level >= level)) { - va_start(ap, format); - control->log_cb(control->log_data, level, line, file, func, format, ap); - va_end(ap); - } else if (control->msgout) { + if (control->msgout) { va_start(ap, format); vfprintf(control->msgout, format, ap); va_end(ap); @@ -528,11 +523,7 @@ static inline void __attribute__((format(printf, 6, 7))) print_stuff(const rzip_ static inline void __attribute__((format(printf, 5, 6))) print_err(const rzip_control *control, unsigned int line, const char *file, const char *func, const char *format, ...) { va_list ap; - if (control->library_mode && control->log_cb && (control->log_level >= 0)) { - va_start(ap, format); - control->log_cb(control->log_data, 0, line, file, func, format, ap); - va_end(ap); - } else if (control->msgerr) { + if (control->msgerr) { va_start(ap, format); vfprintf(control->msgerr, format, ap); va_end(ap); diff --git a/util.h b/util.h index e5934aa..3068c99 100644 --- a/util.h +++ b/util.h @@ -43,8 +43,6 @@ static inline void __attribute__((format(printf, 5, 6))) fatal(const rzip_contro } else control->log_cb(control->log_data, 0, line, file, func, format, ap); va_end(ap); - if (!control->library_mode) - fatal_exit((rzip_control*)control); } #ifdef fatal # undef fatal @@ -68,8 +66,6 @@ static inline void __attribute__((format(printf, 5, 6))) failure(const rzip_cont else control->log_cb(control->log_data, 0, line, file, func, format, ap); va_end(ap); - if (!control->library_mode) - fatal_exit((rzip_control*)control); } #ifdef failure # undef failure