Remove some empty functions and dead code

10 files changed, 0 insertions, 37 deletions

diff --git a/src/db.h b/src/db.h
index dd1e3a4..b6e12fc 100644
--- a/src/db.h
+++ b/src/db.h
@@ -69,9 +69,6 @@ db_row_t db_fetch_row(db_resultset_t* pResultSet);
 void db_free_result(db_resultset_t* pResultSet);
 gint db_get_last_insert_id(void);
 
-void db_begin_thread(void);
-void db_end_thread(void);
-
 gchar* db_make_escaped_string(const gchar* pszString);
 void db_free_escaped_string(gchar* pszString);
 
diff --git a/src/location.c b/src/location.c
index 9f19c16..6cf5799 100644
--- a/src/location.c
+++ b/src/location.c
@@ -30,12 +30,6 @@
 
 gboolean location_lookup_attribute_name(const gchar* pszName, gint* pnReturnID);
 
-struct {
-} g_Location;
-
-void location_init()
-{
-}
 
 // get a new point struct from the allocator
 gboolean location_alloc(location_t** ppLocation)
diff --git a/src/main.c b/src/main.c
index 930aae7..444a017 100644
--- a/src/main.c
+++ b/src/main.c
@@ -153,8 +153,6 @@ gboolean main_init(void)
 
 	g_print("initializing map styles\n");
 	map_style_init();
-	g_print("initializing map\n");
-	map_init();
 
 	g_print("initializing gpsclient\n");
 	gpsclient_init();
@@ -198,9 +196,6 @@ gboolean main_init(void)
 	g_print("initializing search\n");
 	search_init();
 
-	g_print("initializing locations\n");
-	location_init();
-
 	g_print("initialization complete\n");
 	return TRUE;
 }
diff --git a/src/map.c b/src/map.c
index 9183875..e3b6b4c 100644
--- a/src/map.c
+++ b/src/map.c
@@ -155,12 +155,6 @@ gchar* g_apszMapRenderTypeNames[] = {"lines", "polygons", "line-labels", "polygo
 //  Init
 // ========================================================
 
-// init the module
-void map_init(void)
-{
-	//g_print("*********************************** %f\n", WORLD_FEET_PER_DEGREE);
-}
-
 gboolean map_new(map_t** ppMap, GtkWidget* pTargetWidget)
 {
 	g_assert(ppMap != NULL);
diff --git a/src/map.h b/src/map.h
index 7aa2785..23a49e1 100644
--- a/src/map.h
+++ b/src/map.h
@@ -272,7 +272,6 @@ typedef struct {
 // extern draworder_t layerdraworder[NUM_SUBLAYER_TO_DRAW];    //
 
 
-void map_init(void);
 gboolean map_new(map_t** ppMap, GtkWidget* pTargetWidget);
 
 // Gets and Sets
diff --git a/src/search.c b/src/search.c
index f6ebee0..f33a754 100644
--- a/src/search.c
+++ b/src/search.c
@@ -36,7 +36,6 @@
 void search_init()
 {
 	search_road_init();
-	search_location_init();
 	search_city_init();
 	search_coordinate_init();
 }
diff --git a/src/search_location.c b/src/search_location.c
index 8b91d02..cce3dfc 100644
--- a/src/search_location.c
+++ b/src/search_location.c
@@ -49,10 +49,6 @@
 void search_location_on_words(gchar** aWords, gint nWordCount);
 void search_location_filter_result(gint nLocationID, gint nLocationSetID, const gchar* pszName, const gchar* pszAddress, const mappoint_t* pCoordinates);
 
-void search_location_init()
-{
-	
-}
 
 void search_location_execute(const gchar* pszSentence)
 {
diff --git a/src/search_location.h b/src/search_location.h
index 4f71df2..0a35231 100644
--- a/src/search_location.h
+++ b/src/search_location.h
@@ -26,7 +26,6 @@
 
 G_BEGIN_DECLS
 
-void search_location_init();
 void search_location_execute(const gchar* pszSentence);
 
 G_END_DECLS
diff --git a/src/util.c b/src/util.c
index 933b2fd..b9ccc1d 100644
--- a/src/util.c
+++ b/src/util.c
@@ -554,12 +554,6 @@ gchar* util_format_gdouble(gdouble d)
 	return g_strdup(achBuffer);
 }
 
-void util_g_free_with_param(gpointer pMemory, gpointer _unused)
-{
-	g_assert(pMemory != NULL);
-	g_free(pMemory);
-}
-
 EDirection util_match_border(gint nX, gint nY, gint nWidth, gint nHeight, gint nBorderSize)
 {
 	EDirection eDirection;
diff --git a/src/util.h b/src/util.h
index d185216..aae45eb 100644
--- a/src/util.h
+++ b/src/util.h
@@ -28,8 +28,6 @@
 
 #define GTK_PROCESS_MAINLOOP  while (gtk_events_pending ()) { gtk_main_iteration (); }
 
-#define SWAP(x, y)                   { (x) ^= (y) ^= (x) ^= (y); }
-
 void util_random_color(void* pColor);
 gboolean util_parse_hex_color(const gchar* pszString, void* pReturnColor);
 
@@ -95,8 +93,6 @@ gdouble util_get_percent_of_range(gint nMiddle, gint nA, gint nB);
 
 gchar* util_format_gdouble(gdouble d);
 
-void util_g_free_with_param(gpointer pMemory, gpointer _unused);
-
 EDirection util_match_border(gint nX, gint nY, gint nWidth, gint nHeight, gint nBorderSize);
 
 #endif