From 5fbb80f25561fcc21ef91b36d11f7c57f61b396f Mon Sep 17 00:00:00 2001 From: woglinde Date: Thu, 18 Mar 2010 09:06:41 +0000 Subject: [PATCH] Fix:Core:Fix some memory leaks for debug stuff and one unreachable codeline git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3045 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/debug.c | 7 +++++++ navit/navit/debug.h | 1 + navit/navit/event.c | 1 - navit/navit/start_real.c | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/navit/navit/debug.c b/navit/navit/debug.c index d30ab5d..fa73c78 100644 --- a/navit/navit/debug.c +++ b/navit/navit/debug.c @@ -221,3 +221,10 @@ void debug_set_logfile(const char *path) fflush(debug_fp); } } + +void debug_finished(void) { + g_free(gdb_program); + g_hash_table_destroy(debug_hash); + debug_destroy(); +} + diff --git a/navit/navit/debug.h b/navit/navit/debug.h index 02f11dd..f7d13d9 100644 --- a/navit/navit/debug.h +++ b/navit/navit/debug.h @@ -44,6 +44,7 @@ struct debug *debug_new(struct attr *parent, struct attr **attrs); void debug_vprintf(int level, const char *module, const int mlen, const char *function, const int flen, int prefix, const char *fmt, va_list ap); void debug_printf(int level, const char *module, const int mlen, const char *function, const int flen, int prefix, const char *fmt, ...); void debug_assert_fail(char *module, const int mlen,const char *function, const int flen, char *file, int line, char *expr); +void debug_finished(void); /* end of prototypes */ #ifdef __cplusplus diff --git a/navit/navit/event.c b/navit/navit/event.c index 99658e4..b772bf1 100644 --- a/navit/navit/event.c +++ b/navit/navit/event.c @@ -40,7 +40,6 @@ void event_main_loop_quit(void) { if (event_methods.main_loop_quit) event_methods.main_loop_quit(); - exit(0); } struct event_watch * diff --git a/navit/navit/start_real.c b/navit/navit/start_real.c index eae4e9a..a1cbc1f 100644 --- a/navit/navit/start_real.c +++ b/navit/navit/start_real.c @@ -177,5 +177,6 @@ int main_real(int argc, char **argv) } event_main_loop_run(); + debug_finished(); return 0; } -- 2.7.4