Package: ndoutils Version: 1.4b9-1 Severity: minor Tags: patch Hi there,
While building ndoutils a few times, I noticed that it doesn't normally
use -Wall in building. Adding this to my environment resulted in a
nice number of warnings during build, so I tidied them up and thought
I'd pass them on.
Thanks,
diff -Nru ndoutils-1.4b9/include/config.h.in
ndoutils-1.4b9-nowarnings/include/config.h.in
--- ndoutils-1.4b9/include/config.h.in 2009-09-15 13:04:35.000000000 +0100
+++ ndoutils-1.4b9-nowarnings/include/config.h.in 2010-05-01
15:53:23.000000000 +0100
@@ -9,6 +9,7 @@
#ifndef _CONFIG_H
#define _CONFIG_H
+#define _GNU_SOURCE 1
#include <stdio.h>
#include <stdlib.h>
diff -Nru ndoutils-1.4b9/src/dbhandlers.c
ndoutils-1.4b9-nowarnings/src/dbhandlers.c
--- ndoutils-1.4b9/src/dbhandlers.c 2009-10-27 07:51:35.000000000 +0000
+++ ndoutils-1.4b9-nowarnings/src/dbhandlers.c 2010-05-01 16:02:34.000000000
+0100
@@ -3435,7 +3435,7 @@
/* get the object id of the member */
result=ndo2db_get_object_id_with_insert(idi,NDO2DB_OBJECTTYPE_HOST,mbuf.buffer[x],NULL,&member_id);
- if(asprintf(&buf,"instance_id='%d', host_id='%lu',
parent_host_object_id='%lu'"
+ if(asprintf(&buf,"instance_id='%lu', host_id='%lu',
parent_host_object_id='%lu'"
,idi->dbinfo.instance_id
,host_id
,member_id
@@ -3464,7 +3464,7 @@
/* get the object id of the member */
result=ndo2db_get_object_id_with_insert(idi,NDO2DB_OBJECTTYPE_CONTACTGROUP,mbuf.buffer[x],NULL,&member_id);
- if(asprintf(&buf,"instance_id='%d', host_id='%lu',
contactgroup_object_id='%lu'"
+ if(asprintf(&buf,"instance_id='%lu', host_id='%lu',
contactgroup_object_id='%lu'"
,idi->dbinfo.instance_id
,host_id
,member_id
@@ -3493,7 +3493,7 @@
/* get the object id of the member */
result=ndo2db_get_object_id_with_insert(idi,NDO2DB_OBJECTTYPE_CONTACT,mbuf.buffer[x],NULL,&member_id);
- if(asprintf(&buf,"instance_id='%d', host_id='%lu',
contact_object_id='%lu'"
+ if(asprintf(&buf,"instance_id='%lu', host_id='%lu',
contact_object_id='%lu'"
,idi->dbinfo.instance_id
,host_id
,member_id
@@ -3592,7 +3592,7 @@
/* get the object id of the member */
result=ndo2db_get_object_id_with_insert(idi,NDO2DB_OBJECTTYPE_HOST,mbuf.buffer[x],NULL,&member_id);
- if(asprintf(&buf,"instance_id='%d', hostgroup_id='%lu',
host_object_id='%lu'"
+ if(asprintf(&buf,"instance_id='%lu', hostgroup_id='%lu',
host_object_id='%lu'"
,idi->dbinfo.instance_id
,group_id
,member_id
@@ -3837,7 +3837,7 @@
/* get the object id of the member */
result=ndo2db_get_object_id_with_insert(idi,NDO2DB_OBJECTTYPE_CONTACTGROUP,mbuf.buffer[x],NULL,&member_id);
- if(asprintf(&buf,"instance_id='%d', service_id='%lu',
contactgroup_object_id='%lu'"
+ if(asprintf(&buf,"instance_id='%lu', service_id='%lu',
contactgroup_object_id='%lu'"
,idi->dbinfo.instance_id
,service_id
,member_id
@@ -3866,7 +3866,7 @@
/* get the object id of the member */
result=ndo2db_get_object_id_with_insert(idi,NDO2DB_OBJECTTYPE_CONTACT,mbuf.buffer[x],NULL,&member_id);
- if(asprintf(&buf,"instance_id='%d', service_id='%lu',
contact_object_id='%lu'"
+ if(asprintf(&buf,"instance_id='%lu', service_id='%lu',
contact_object_id='%lu'"
,idi->dbinfo.instance_id
,service_id
,member_id
@@ -3971,7 +3971,7 @@
/* get the object id of the member */
result=ndo2db_get_object_id_with_insert(idi,NDO2DB_OBJECTTYPE_SERVICE,hptr,sptr,&member_id);
- if(asprintf(&buf,"instance_id='%d', servicegroup_id='%lu',
service_object_id='%lu'"
+ if(asprintf(&buf,"instance_id='%lu', servicegroup_id='%lu',
service_object_id='%lu'"
,idi->dbinfo.instance_id
,group_id
,member_id
@@ -4220,7 +4220,7 @@
/* get the object id of the member */
result=ndo2db_get_object_id_with_insert(idi,NDO2DB_OBJECTTYPE_CONTACTGROUP,mbuf.buffer[x],NULL,&member_id);
- if(asprintf(&buf,"instance_id='%d', hostescalation_id='%lu',
contactgroup_object_id='%lu'"
+ if(asprintf(&buf,"instance_id='%lu', hostescalation_id='%lu',
contactgroup_object_id='%lu'"
,idi->dbinfo.instance_id
,escalation_id
,member_id
@@ -4249,7 +4249,7 @@
/* get the object id of the member */
result=ndo2db_get_object_id_with_insert(idi,NDO2DB_OBJECTTYPE_CONTACT,mbuf.buffer[x],NULL,&member_id);
- if(asprintf(&buf,"instance_id='%d', hostescalation_id='%lu',
contact_object_id='%lu'"
+ if(asprintf(&buf,"instance_id='%lu', hostescalation_id='%lu',
contact_object_id='%lu'"
,idi->dbinfo.instance_id
,escalation_id
,member_id
@@ -4364,7 +4364,7 @@
/* get the object id of the member */
result=ndo2db_get_object_id_with_insert(idi,NDO2DB_OBJECTTYPE_CONTACTGROUP,mbuf.buffer[x],NULL,&member_id);
- if(asprintf(&buf,"instance_id='%d', serviceescalation_id='%lu',
contactgroup_object_id='%lu'"
+ if(asprintf(&buf,"instance_id='%lu',
serviceescalation_id='%lu', contactgroup_object_id='%lu'"
,idi->dbinfo.instance_id
,escalation_id
,member_id
@@ -4393,7 +4393,7 @@
/* get the object id of the member */
result=ndo2db_get_object_id_with_insert(idi,NDO2DB_OBJECTTYPE_CONTACT,mbuf.buffer[x],NULL,&member_id);
- if(asprintf(&buf,"instance_id='%d', serviceescalation_id='%lu',
contact_object_id='%lu'"
+ if(asprintf(&buf,"instance_id='%lu',
serviceescalation_id='%lu', contact_object_id='%lu'"
,idi->dbinfo.instance_id
,escalation_id
,member_id
@@ -4558,7 +4558,7 @@
start_sec=strtoul(startptr,NULL,0);
end_sec=strtoul(endptr,NULL,0);
- if(asprintf(&buf,"instance_id='%d', timeperiod_id='%lu',
day='%d', start_sec='%lu', end_sec='%lu'"
+ if(asprintf(&buf,"instance_id='%lu', timeperiod_id='%lu',
day='%d', start_sec='%lu', end_sec='%lu'"
,idi->dbinfo.instance_id
,timeperiod_id
,day
@@ -4723,7 +4723,7 @@
address_number=atoi(numptr);
es[0]=ndo2db_db_escape_string(idi,addressptr);
- if(asprintf(&buf,"instance_id='%d', contact_id='%lu',
address_number='%d', address='%s'"
+ if(asprintf(&buf,"instance_id='%lu', contact_id='%lu',
address_number='%d', address='%s'"
,idi->dbinfo.instance_id
,contact_id
,address_number
@@ -4763,7 +4763,7 @@
es[0]=ndo2db_db_escape_string(idi,argptr);
- if(asprintf(&buf,"instance_id='%d', contact_id='%lu',
notification_type='%d', command_object_id='%lu', command_args='%s'"
+ if(asprintf(&buf,"instance_id='%lu', contact_id='%lu',
notification_type='%d', command_object_id='%lu', command_args='%s'"
,idi->dbinfo.instance_id
,contact_id
,HOST_NOTIFICATION
@@ -4804,7 +4804,7 @@
es[0]=ndo2db_db_escape_string(idi,argptr);
- if(asprintf(&buf,"instance_id='%d', contact_id='%lu',
notification_type='%d', command_object_id='%lu', command_args='%s'"
+ if(asprintf(&buf,"instance_id='%lu', contact_id='%lu',
notification_type='%d', command_object_id='%lu', command_args='%s'"
,idi->dbinfo.instance_id
,contact_id
,SERVICE_NOTIFICATION
@@ -4907,7 +4907,7 @@
/* get the object id of the member */
result=ndo2db_get_object_id_with_insert(idi,NDO2DB_OBJECTTYPE_CONTACT,mbuf.buffer[x],NULL,&member_id);
- if(asprintf(&buf,"instance_id='%d', contactgroup_id='%lu',
contact_object_id='%lu'"
+ if(asprintf(&buf,"instance_id='%lu', contactgroup_id='%lu',
contact_object_id='%lu'"
,idi->dbinfo.instance_id
,group_id
,member_id
@@ -4962,7 +4962,7 @@
free(buf1);
if (table_idx==NDO2DB_DBTABLE_CUSTOMVARIABLES) {
- if(asprintf(&buf,"instance_id='%d', object_id='%lu',
config_type='%d', has_been_modified='%d', varname='%s', varvalue='%s'"
+ if(asprintf(&buf,"instance_id='%lu', object_id='%d',
config_type='%d', has_been_modified='%d', varname='%s', varvalue='%s'"
,idi->dbinfo.instance_id
,o_id
,idi->current_object_config_type
@@ -4973,7 +4973,7 @@
buf=NULL;
}
if (table_idx==NDO2DB_DBTABLE_CUSTOMVARIABLESTATUS) {
- if(asprintf(&buf,"instance_id='%d',
object_id='%lu',status_update_time=%s, has_been_modified='%d', varname='%s',
varvalue='%s'"
+ if(asprintf(&buf,"instance_id='%lu',
object_id='%d',status_update_time=%s, has_been_modified='%d', varname='%s',
varvalue='%s'"
,idi->dbinfo.instance_id
,o_id
,(ts==NULL)?"NULL":ts
diff -Nru ndoutils-1.4b9/src/io.c ndoutils-1.4b9-nowarnings/src/io.c
--- ndoutils-1.4b9/src/io.c 2009-10-21 08:53:30.000000000 +0100
+++ ndoutils-1.4b9-nowarnings/src/io.c 2010-05-01 15:49:54.000000000 +0100
@@ -147,8 +147,9 @@
struct hostent *hp=NULL;
mode_t mode=S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP;
int newfd=0;
+#ifdef HAVE_SSL
int rc=0;
-
+#endif
/* use file */
if(type==NDO_SINK_FILE){
if((newfd=open(name,flags,mode))==-1)
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8) (ignored: LC_ALL
set to en_US.utf8)
Shell: /bin/sh linked to /bin/dash
--
-----------------------------------------------------------------
| ,''`. Stephen Gran |
| : :' : sg...@debian.org |
| `. `' Debian user, admin, and developer |
| `- http://www.debian.org |
-----------------------------------------------------------------
signature.asc
Description: Digital signature
