diff options
| -rw-r--r-- | navit/start_real.c | 19 | ||||
| -rw-r--r-- | navit/xmlconfig.c | 2 |
2 files changed, 2 insertions, 19 deletions
diff --git a/navit/start_real.c b/navit/start_real.c index a86211f02..10a28acb4 100644 --- a/navit/start_real.c +++ b/navit/start_real.c @@ -82,21 +82,15 @@ int main_real(int argc, const char **argv) main_argc=argc; main_argv=argv; - dbg(0,"at 1\n"); #ifdef HAVE_GLIB event_glib_init(); #else _g_slice_thread_init_nomessage(); #endif - dbg(0,"at 2\n"); atom_init(); - dbg(0,"at 3\n"); main_init(argv[0]); - dbg(0,"at 4\n"); main_init_nls(); - dbg(0,"at 5\n"); debug_init(argv[0]); - dbg(0,"at 6\n"); cp = getenv("NAVIT_LOGFILE"); if (cp) { @@ -107,23 +101,15 @@ int main_real(int argc, const char **argv) debug_set_logfile("/Storage Card/navit.log"); } #endif - dbg(0,"at 7\n"); file_init(); - dbg(0,"at 8\n"); #ifndef USE_PLUGINS builtin_init(); #endif - dbg(0,"at 9\n"); route_init(); - dbg(0,"at 10\n"); navigation_init(); - dbg(0,"at 11\n"); tracking_init(); - dbg(0,"at 12\n"); search_init(); - dbg(0,"at 13\n"); linguistics_init(); - dbg(0,"at 14\n"); config_file=NULL; #ifdef HAVE_GETOPT_H opterr=0; //don't bomb out on errors. @@ -173,7 +159,6 @@ int main_real(int argc, const char **argv) if (optind < argc) config_file = argv[optind]; } - dbg(0,"at 15\n"); // if config file is explicitely given only look for it, otherwise try std paths if (config_file) { list = g_list_append(list,g_strdup(config_file)); @@ -193,7 +178,6 @@ int main_real(int argc, const char **argv) list = g_list_append(list,g_strdup("/etc/navit/navit.xml")); #endif } - dbg(0,"at 16\n"); li = list; for (;;) { if (li == NULL) { @@ -211,13 +195,12 @@ int main_real(int argc, const char **argv) li = g_list_next(li); } - dbg(0,"at 17 %s\n",config_file); + dbg(0,"Loading %s\n",config_file); if (!config_load(config_file, &error)) { dbg(0, _("Error parsing config file '%s': %s\n"), config_file, error ? error->message : ""); } else { dbg(0, _("Using config file '%s'\n"), config_file); } - dbg(0,"at 18\n"); while (li) { g_free(li->data); li = g_list_next(li); diff --git a/navit/xmlconfig.c b/navit/xmlconfig.c index 8acf5e07a..e2b2fd2c7 100644 --- a/navit/xmlconfig.c +++ b/navit/xmlconfig.c @@ -343,7 +343,7 @@ static char *element_fixmes[]={ }; static void initStatic(void) { - elements=g_new0(struct element_func,40); //39 is a number of elements + ending NULL element + elements=g_new0(struct element_func,41); //40 is a number of elements + ending NULL element elements[0].name="config"; elements[0].parent=NULL; |