From 691df94e56c2fd1179e76da1a609947df687f40f Mon Sep 17 00:00:00 2001 From: doursse Date: Tue, 12 Sep 2006 07:35:49 +0000 Subject: [PATCH] free memory when we quit the tests. Free allocated string in the xcb apps SVN revision: 25759 --- legacy/evas/src/bin/evas_software_xcb_main.c | 1 + legacy/evas/src/bin/evas_xrender_x11_main.c | 8 +++++++- legacy/evas/src/bin/evas_xrender_xcb_main.c | 12 +++--------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/legacy/evas/src/bin/evas_software_xcb_main.c b/legacy/evas/src/bin/evas_software_xcb_main.c index e1fc1ad23f..9a4036d428 100644 --- a/legacy/evas/src/bin/evas_software_xcb_main.c +++ b/legacy/evas/src/bin/evas_software_xcb_main.c @@ -90,6 +90,7 @@ class_set (XCBConnection *c, XCBWINDOW win, const char *name, const char *class) win, rep->atom, encoding, 8, strlen (class_str), class_str); free (rep); + free (class_str); } int diff --git a/legacy/evas/src/bin/evas_xrender_x11_main.c b/legacy/evas/src/bin/evas_xrender_x11_main.c index 46295e75d7..058f697379 100644 --- a/legacy/evas/src/bin/evas_xrender_x11_main.c +++ b/legacy/evas/src/bin/evas_xrender_x11_main.c @@ -85,7 +85,7 @@ main(int argc, char **argv) { case ButtonPress: if (ev.xbutton.button == 3) - exit(0); + goto exit; #if 0 if (!pause_me) pause_me = 1; @@ -129,6 +129,12 @@ main(int argc, char **argv) if (pause_me == 2) usleep(100000); } + + exit: + setdown(); + evas_free(evas); + XCloseDisplay(disp); evas_shutdown(); + return 0; } diff --git a/legacy/evas/src/bin/evas_xrender_xcb_main.c b/legacy/evas/src/bin/evas_xrender_xcb_main.c index 62d5b737e0..f9444a8d87 100644 --- a/legacy/evas/src/bin/evas_xrender_xcb_main.c +++ b/legacy/evas/src/bin/evas_xrender_xcb_main.c @@ -92,6 +92,7 @@ class_set (XCBConnection *c, XCBWINDOW win, const char *name, const char *class) win, rep->atom, encoding, 8, strlen (class_str), class_str); free (rep); + free (class_str); } int @@ -186,15 +187,7 @@ main(int argc, char **argv) XCBButtonPressEvent *ev = (XCBButtonPressEvent *)e; if (ev->detail.id == 3) - { - setdown(); - evas_free(evas); - free(e); - XCBDisconnect(conn); - evas_shutdown(); - exit(0); - - } + goto exit; #if 0 if (!pause_me) pause_me = 1; @@ -253,6 +246,7 @@ main(int argc, char **argv) usleep(100000); } + exit: setdown(); evas_free(evas); XCBDisconnect(conn);