From a12feb1d950d2fc2d30ac69f1175e9fa7d48deaf Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Thu, 10 Jun 2010 21:43:28 +0200 Subject: Remove D_ENTER/D_RETURN, use gdb tracepoints + readelf/awk magic instead --- src/main.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 386943f..56f636a 100644 --- a/src/main.c +++ b/src/main.c @@ -38,7 +38,6 @@ char *mode = NULL; int main(int argc, char **argv) { - D_ENTER(4); atexit(feh_clean_exit); init_parse_options(argc, argv); @@ -77,7 +76,7 @@ int main(int argc, char **argv) /* main event loop */ while (feh_main_iteration(1)); - D_RETURN(4, 0); + return(0); } /* Return 0 to stop iterating, 1 if ok to continue. */ @@ -94,10 +93,8 @@ int feh_main_iteration(int block) double t1 = 0.0, t2 = 0.0; fehtimer ft; - D_ENTER(5); - if (window_num == 0) - D_RETURN(5, 0); + return(0); if (first) { /* Only need to set these up the first time */ @@ -117,7 +114,7 @@ int feh_main_iteration(int block) (*(ev_handler[ev.type])) (&ev); if (window_num == 0) - D_RETURN(5, 0); + return(0); } XFlush(disp); @@ -182,18 +179,17 @@ int feh_main_iteration(int block) } } if (window_num == 0) - D_RETURN(5, 0); - D_RETURN(5, 1); + return(0); + + return(1); } void feh_clean_exit(void) { - D_ENTER(4); - delete_rm_files(); if (opt.filelistfile) feh_write_filelist(filelist, opt.filelistfile); - D_RETURN_(4); + return; } -- cgit v1.2.3