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/keyevents.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/keyevents.c') diff --git a/src/keyevents.c b/src/keyevents.c index a5cafb9..67f5389 100644 --- a/src/keyevents.c +++ b/src/keyevents.c @@ -31,7 +31,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. void feh_event_invoke_action(winwidget winwid, char *action) { - D_ENTER(4); D(4, ("action is '%s'\n", action)); D(4, ("winwid is '%p'\n", winwid)); if (action) { @@ -47,7 +46,7 @@ void feh_event_invoke_action(winwidget winwid, char *action) printf("For now, open the image to perform the action on it.\n"); } } - D_RETURN_(4); + return; } void feh_event_handle_keypress(XEvent * ev) @@ -61,8 +60,6 @@ void feh_event_handle_keypress(XEvent * ev) feh_menu_item *selected_item; feh_menu *selected_menu; - D_ENTER(4); - winwid = winwidget_get_from_window(ev->xkey.window); /* nuke dupe events, unless we're typing text */ @@ -100,11 +97,11 @@ void feh_event_handle_keypress(XEvent * ev) break; } - D_RETURN_(4); + return; } if (winwid == NULL) - D_RETURN_(4); + return; if (winwid->caption_entry) { switch (keysym) { @@ -125,7 +122,7 @@ void feh_event_handle_keypress(XEvent * ev) fp = fopen(caption_filename, "w"); if (!fp) { weprintf("couldn't write to captions file %s:", caption_filename); - D_RETURN_(4); + return; } fprintf(fp, "%s", FEH_FILE(winwid->file->data)->caption); free(caption_filename); @@ -154,7 +151,7 @@ void feh_event_handle_keypress(XEvent * ev) } break; } - D_RETURN_(4); + return; } switch (keysym) { @@ -289,7 +286,7 @@ void feh_event_handle_keypress(XEvent * ev) } if (len <= 0 || len > (int) sizeof(kbuf)) - D_RETURN_(4); + return; kbuf[len] = '\0'; switch (*kbuf) { @@ -409,5 +406,5 @@ void feh_event_handle_keypress(XEvent * ev) default: break; } - D_RETURN_(4); + return; } -- cgit v1.2.3