[icinga-checkins] icinga.org: icinga-core/feature/exclude-with-regexp-3720: fix gcc warnings

git at icinga.org git at icinga.org
Sat Jul 20 13:54:45 CEST 2013


Module: icinga-core
Branch: feature/exclude-with-regexp-3720
Commit: 86696865629ae803975e932adcf9b9749775e8d0
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=86696865629ae803975e932adcf9b9749775e8d0

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Sun Jun 30 15:47:59 2013 +0200

fix gcc warnings

---

 module/idoutils/src/dbhandlers.c |    3 ---
 module/idoutils/src/dbqueries.c  |   10 ----------
 module/idoutils/src/ido2db.c     |    4 ++--
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/module/idoutils/src/dbhandlers.c b/module/idoutils/src/dbhandlers.c
index 3c18fa9..961519b 100644
--- a/module/idoutils/src/dbhandlers.c
+++ b/module/idoutils/src/dbhandlers.c
@@ -922,9 +922,6 @@ int ido2db_set_objects_as_active(ido2db_idi *idi, unsigned long *object_ids, int
 
 int ido2db_set_object_as_active(ido2db_idi *idi, unsigned long object_id) {
 	int result = IDO_OK;
-#ifdef USE_LIBDBI
-	char *buf = NULL;
-#endif
 
 #ifdef USE_ORACLE
 
diff --git a/module/idoutils/src/dbqueries.c b/module/idoutils/src/dbqueries.c
index 129f044..1caa793 100644
--- a/module/idoutils/src/dbqueries.c
+++ b/module/idoutils/src/dbqueries.c
@@ -5207,7 +5207,6 @@ int ido2db_query_insert_or_update_configfilevariables_add(ido2db_idi *idi, void
         char * query1 = NULL;
         char * query2 = NULL;
 	char * buf1 = NULL;
-        unsigned long configfile_id;
         int mysql_update = FALSE;
 #endif
 #ifdef USE_ORACLE
@@ -5647,7 +5646,6 @@ int ido2db_query_insert_or_update_hostdefinition_definition_add(ido2db_idi *idi,
         char * query1 = NULL;
         char * query2 = NULL;
 	char * buf = NULL;
-        unsigned long host_id;
 	int do_insert = FALSE;
 #endif
 #ifdef USE_ORACLE
@@ -6677,7 +6675,6 @@ int ido2db_query_insert_or_update_hostgroupdefinition_definition_add(ido2db_idi
         char * query1 = NULL;
         char * query2 = NULL;
 	char * buf = NULL;
-        unsigned long hostgroup_id;
         int mysql_update = FALSE;
 #endif
 #ifdef USE_ORACLE
@@ -7083,7 +7080,6 @@ int ido2db_query_insert_or_update_servicedefinition_definition_add(ido2db_idi *i
         char * query1 = NULL;
         char * query2 = NULL;
 	char * buf = NULL;
-        unsigned long service_id;
         int do_insert = FALSE;
 #endif
 #ifdef USE_ORACLE
@@ -7894,7 +7890,6 @@ int ido2db_query_insert_or_update_servicegroupdefinition_definition_add(ido2db_i
         char * query1 = NULL;
         char * query2 = NULL;
 	char * buf = NULL;
-        unsigned long servicegroup_id;
         int mysql_update = FALSE;
 #endif
 #ifdef USE_ORACLE
@@ -8748,7 +8743,6 @@ int ido2db_query_insert_or_update_hostescalationdefinition_definition_add(ido2db
         char * query1 = NULL;
         char * query2 = NULL;
 	char * buf = NULL;
-        unsigned long hostescalation_id;
         int mysql_update = FALSE;
 #endif
 #ifdef USE_ORACLE
@@ -9373,7 +9367,6 @@ int ido2db_query_insert_or_update_serviceescalationdefinition_definition_add(ido
         char * query1 = NULL;
         char * query2 = NULL;
 	char * buf = NULL;
-        unsigned long serviceescalation_id;
         int mysql_update = FALSE;
 #endif
 #ifdef USE_ORACLE
@@ -10186,7 +10179,6 @@ int ido2db_query_insert_or_update_timeperiodefinition_definition_add(ido2db_idi
         char * query1 = NULL;
         char * query2 = NULL;
 	char * buf = NULL;
-        unsigned long timeperiod_id;
         int mysql_update = FALSE;
 #endif
 #ifdef USE_ORACLE
@@ -10613,7 +10605,6 @@ int ido2db_query_insert_or_update_contactdefinition_definition_add(ido2db_idi *i
         char * query1 = NULL;
         char * query2 = NULL;
 	char * buf = NULL;
-        unsigned long contact_id;
         int mysql_update = FALSE;
 #endif
 #ifdef USE_ORACLE
@@ -11923,7 +11914,6 @@ int ido2db_query_insert_or_update_contactgroupdefinition_definition_add(ido2db_i
         char * query1 = NULL;
         char * query2 = NULL;
 	char * buf = NULL;
-        unsigned long contactgroup_id;
         int mysql_update = FALSE;
 #endif
 #ifdef USE_ORACLE
diff --git a/module/idoutils/src/ido2db.c b/module/idoutils/src/ido2db.c
index 81741b7..5556327 100644
--- a/module/idoutils/src/ido2db.c
+++ b/module/idoutils/src/ido2db.c
@@ -1228,7 +1228,7 @@ static size_t ido2db_proxy_get_size_left(ido2db_proxy *proxy) {
 
 	return result;
 }
-
+/*
 static size_t ido2db_proxy_get_size_right(ido2db_proxy *proxy) {
 	size_t result;
 
@@ -1238,7 +1238,7 @@ static size_t ido2db_proxy_get_size_right(ido2db_proxy *proxy) {
 
 	return result;
 }
-
+*/
 int ido2db_wait_for_connections(void) {
 	int sd_flag = 1;
 	int new_sd = 0;





More information about the icinga-checkins mailing list