3535#include "generate.h"
3636#include "input.h"
3737#include "list.h"
38+ #include "logging.h"
3839#include "parsing.h"
3940#include "query.h"
4041#include "remove.h"
@@ -156,7 +157,7 @@ static int build_design(design_t **adesigns, const char *cld)
156157
157158 default :
158159 fprintf (stderr , "%s: internal error\n" , PROJECT );
159- return 1 ; /* never happens ;-) */
160+ return 1 ;
160161 }
161162 c -> name = i ;
162163
@@ -180,9 +181,8 @@ static int build_design(design_t **adesigns, const char *cld)
180181 */
181182static void handle_command_line (int argc , char * argv [])
182183{
183- #ifdef DEBUG
184- fprintf (stderr , "Processing Command Line ...\n" );
185- #endif
184+ log_debug (__FILE__ , MAIN , "Processing Command Line ...\n" );
185+
186186 opt_t * parsed_opts = process_commandline (argc , argv );
187187 if (parsed_opts == NULL ) {
188188 exit (EXIT_FAILURE );
@@ -269,9 +269,8 @@ static void apply_expected_size()
269269 */
270270static void handle_input ()
271271{
272- #ifdef DEBUG
273- fprintf (stderr , "Reading all input ...\n" );
274- #endif
272+ log_debug (__FILE__ , MAIN , "Reading all input ...\n" );
273+
275274 input_t * raw_input = NULL ;
276275 if (opt .mend != 0 ) {
277276 raw_input = read_all_input ();
@@ -287,10 +286,10 @@ static void handle_input()
287286 BFREE (raw_input );
288287 }
289288
290- #ifdef DEBUG
291- fprintf ( stderr , "Effective encoding: %s\n" , encoding );
289+ if ( is_debug_logging ( MAIN )) {
290+ log_debug ( __FILE__ , MAIN , "Effective encoding: %s\n" , encoding );
292291 print_input_lines (NULL );
293- #endif
292+ }
294293 if (input .num_lines == 0 ) {
295294 exit (EXIT_SUCCESS );
296295 }
@@ -362,9 +361,8 @@ static void adjust_size_and_padding()
362361 */
363362static void handle_generate_box ()
364363{
365- #ifdef DEBUG
366- fprintf (stderr , "Generating Box ...\n" );
367- #endif
364+ log_debug (__FILE__ , MAIN , "Generating Box ...\n" );
365+
368366 sentry_t * thebox = (sentry_t * ) calloc (NUM_SIDES , sizeof (sentry_t ));
369367 if (thebox == NULL ) {
370368 perror (PROJECT );
@@ -384,9 +382,8 @@ static void handle_generate_box()
384382 */
385383static void handle_remove_box ()
386384{
387- #ifdef DEBUG
388- fprintf (stderr , "Removing Box ...\n" );
389- #endif
385+ log_debug (__FILE__ , MAIN , "Removing Box ...\n" );
386+
390387 if (opt .killblank == -1 ) {
391388 if (empty_side (opt .design -> shape , BTOP ) && empty_side (opt .design -> shape , BBOT )) {
392389 opt .killblank = 0 ;
@@ -425,15 +422,16 @@ static int terminal_has_colors()
425422 result = 1 ;
426423 }
427424 #endif
428- #if defined(DEBUG )
425+
426+ if (is_debug_logging (MAIN )) {
429427 #ifdef __MINGW32__
430428 int num_colors = 1 ;
431429 #else
432430 int num_colors = result ? tigetnum ("colors" ) : 0 ;
433431 #endif
434- fprintf ( stderr , "Terminal \"%s\" %s colors (number of colors = %d).\n" , termtype != NULL ? termtype : "(null) "
435- result ? "has" : "does NOT have" , num_colors );
436- #endif
432+ log_debug ( __FILE__ , MAIN , "Terminal \"%s\" %s colors (number of colors = %d).\n" ,
433+ termtype != NULL ? termtype : "(null)" , result ? "has" : "does NOT have" , num_colors );
434+ }
437435 return result ;
438436}
439437
@@ -449,9 +447,7 @@ static int check_color_support(int opt_color)
449447 result = terminal_has_colors ();
450448 }
451449
452- #if defined(DEBUG )
453- fprintf (stderr , "%s: Color support %sabled\n" , PROJECT , result ? "\x1b[92mEN\x1b[0m" : "DIS" );
454- #endif
450+ log_debug (__FILE__ , MAIN , "Color support %sabled\n" , result ? "\x1b[92mEN\x1b[0m" : "DIS" );
455451 return result ;
456452}
457453
@@ -485,9 +481,7 @@ int main(int argc, char *argv[])
485481 int saved_designwidth ; /* opt.design->minwith backup, used for mending */
486482 int saved_designheight ; /* opt.design->minheight backup, used for mending */
487483
488- #ifdef DEBUG
489- fprintf (stderr , "BOXES STARTING ...\n" );
490- #endif
484+ log_debug (__FILE__ , MAIN , "BOXES STARTING ...\n" ); /* TODO This line will never execute, because debug not on yet */
491485
492486 /* Temporarily set the system encoding, for proper output of --help text etc. */
493487 activateSystemEncoding ();
@@ -497,9 +491,7 @@ int main(int argc, char *argv[])
497491
498492 /* Store system character encoding */
499493 encoding = check_encoding (opt .encoding , locale_charset ());
500- #ifdef DEBUG
501- fprintf (stderr , "Character Encoding = %s\n" , encoding );
502- #endif
494+ log_debug (__FILE__ , MAIN , "Character Encoding = %s\n" , encoding );
503495
504496 color_output_enabled = check_color_support (opt .color );
505497
0 commit comments