From c038b6a37d65ebf23b34e669414cbb959fc7b2a4 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@derf.homelinux.org>
Date: Fri, 11 Jun 2010 12:00:06 +0200
Subject: debug.h: call_level is no longer relevant, pretty debug message
format
---
src/debug.h | 4 ++--
src/feh.h | 1 -
src/main.c | 1 -
src/menu.c | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/debug.h b/src/debug.h
index db4369d..156bf1c 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -43,7 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
{ \
if(i <= opt.debug_level) \
{ \
- printf("%s +%u %s() %s ",__FILE__,__LINE__,__FUNCTION__, stroflen(' ', call_level)); \
+ printf("%-12s +%-4u %-20s : ",__FILE__,__LINE__,__FUNCTION__); \
printf a; \
fflush(stdout); \
} \
@@ -53,7 +53,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
{ \
if(i <= opt.debug_level) \
{ \
- printf("%s +%u : ",__FILE__,__LINE__); \
+ printf("%-12s +%-4u : ",__FILE__,__LINE__); \
printf a; \
} \
fflush(stdout); \
diff --git a/src/feh.h b/src/feh.h
index 69d342f..5ec9e2b 100644
--- a/src/feh.h
+++ b/src/feh.h
@@ -167,7 +167,6 @@ extern Window root;
extern XContext xid_context;
extern Screen *scr;
extern unsigned char reset_output;
-extern int call_level;
extern feh_menu *menu_main;
extern feh_menu *menu_close;
extern char *mode; /* label for the current mode */
diff --git a/src/main.c b/src/main.c
index 56f636a..ce46879 100644
--- a/src/main.c
+++ b/src/main.c
@@ -33,7 +33,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
char **cmdargv = NULL;
int cmdargc = 0;
-int call_level = 0;
char *mode = NULL;
int main(int argc, char **argv)
diff --git a/src/menu.c b/src/menu.c
index 88bbff9..93bae10 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -691,7 +691,7 @@ void feh_menu_calc_size(feh_menu * m)
void feh_menu_draw_item(feh_menu_item * i, Imlib_Image im, int ox, int oy)
{
- D(5, ("drawing item %p (text %s) on menu %p (name %s)\n", i, i->text, m, m->name));
+ D(5, ("drawing item %p (text %s)\n", i, i->text));
if (i->text) {
D(5, ("text item\n"));
--
cgit v1.2.3