[Nagios-checkins] ndoutils/src db.c, 1.3, 1.4 dbhandlers.c, 1.9, 1.10 file2sock.c, 1.9, 1.10 log2ndo.c, 1.9, 1.10 ndo2db.c, 1.15, 1.16 ndomod.c, 1.15, 1.16 sockdebug.c, 1.9, 1.10

[Hendrik Bäc. <hen...@us...>]

Update of /cvsroot/nagios/ndoutils/src
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4549/src

Modified Files:
	db.c dbhandlers.c file2sock.c log2ndo.c ndo2db.c ndomod.c 
	sockdebug.c 
Log Message:
fix several compiler warnings

Index: dbhandlers.c
===================================================================
RCS file: /cvsroot/nagios/ndoutils/src/dbhandlers.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** dbhandlers.c	11 Jul 2009 07:19:36 -0000	1.9
--- dbhandlers.c	11 Jul 2009 08:30:08 -0000	1.10
***************
*** 2,8 ****
   * DBHANDLERS.C - Data handler routines for NDO2DB daemon
   *
!  * Copyright (c) 2005-2007 Ethan Galstad 
   *
!  * Last Modified: 10-31-2007
   *
   **************************************************************/
--- 2,8 ----
   * DBHANDLERS.C - Data handler routines for NDO2DB daemon
   *
!  * Copyright (c) 2005-2009 Ethan Galstad
   *
!  * Last Modified: 07-11-2009
   *
   **************************************************************/
***************
*** 2260,2268 ****
  	int x=0;
  	int result=NDO_OK;
- 	char *ptr1=NULL;
- 	char *ptr2=NULL;
- 	char *ptr3=NULL;
- 	int has_been_modified=0;
- 	ndo2db_mbuf mbuf;
  
  	if(idi==NULL)
--- 2260,2263 ----
***************
*** 2464,2472 ****
  	int x=0;
  	int result=NDO_OK;
- 	char *ptr1=NULL;
- 	char *ptr2=NULL;
- 	char *ptr3=NULL;
- 	int has_been_modified=0;
- 	ndo2db_mbuf mbuf;
  
  	if(idi==NULL)
--- 2459,2462 ----
***************
*** 2631,2635 ****
  	int host_notifications_enabled=0;
  	int service_notifications_enabled=0;
- 	char *es[2];
  	char *ts[3];
  	char *buf=NULL;
--- 2621,2624 ----
***************
*** 2638,2646 ****
  	int x=0;
  	int result=NDO_OK;
- 	char *ptr1=NULL;
- 	char *ptr2=NULL;
- 	char *ptr3=NULL;
- 	int has_been_modified=0;
- 	ndo2db_mbuf mbuf;
  
  	if(idi==NULL)
--- 2627,2630 ----
***************
*** 3257,3264 ****
  	char *cmdptr=NULL;
  	char *argptr=NULL;
- 	char *ptr1=NULL;
- 	char *ptr2=NULL;
- 	char *ptr3=NULL;
- 	int has_been_modified=0;
  
  	if(idi==NULL)
--- 3241,3244 ----
***************
*** 3675,3682 ****
  	char *cmdptr=NULL;
  	char *argptr=NULL;
- 	char *ptr1=NULL;
- 	char *ptr2=NULL;
- 	char *ptr3=NULL;
- 	int has_been_modified=0;
  
  	if(idi==NULL)
--- 3655,3658 ----
***************
*** 4626,4633 ****
  	char *cmdptr=NULL;
  	char *argptr=NULL;
- 	char *ptr1=NULL;
- 	char *ptr2=NULL;
- 	char *ptr3=NULL;
- 	int has_been_modified=0;
  
  	if(idi==NULL)
--- 4602,4605 ----

Index: log2ndo.c
===================================================================
RCS file: /cvsroot/nagios/ndoutils/src/log2ndo.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** log2ndo.c	3 Jan 2009 16:10:30 -0000	1.9
--- log2ndo.c	11 Jul 2009 08:30:08 -0000	1.10
***************
*** 2,6 ****
   * LOG2NDO.C - Sends archived logs files to NDO2DB daemon
   *
!  * Copyright (c) 2005-2007 Ethan Galstad 
   *
   * Last Modified: 01-03-2009
--- 2,6 ----
   * LOG2NDO.C - Sends archived logs files to NDO2DB daemon
   *
!  * Copyright (c) 2005-2009 Ethan Galstad
   *
   * Last Modified: 01-03-2009

Index: db.c
===================================================================
RCS file: /cvsroot/nagios/ndoutils/src/db.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** db.c	31 Oct 2007 18:17:05 -0000	1.3
--- db.c	11 Jul 2009 08:30:08 -0000	1.4
***************
*** 2,8 ****
   * DB.C - Datatabase routines for NDO2DB daemon
   *
!  * Copyright (c) 2005-2007 Ethan Galstad 
   *
!  * Last Modified: 10-18-2007
   *
   **************************************************************/
--- 2,8 ----
   * DB.C - Datatabase routines for NDO2DB daemon
   *
!  * Copyright (c) 2005-2009 Ethan Galstad
   *
!  * Last Modified: 07-11-2009
   *
   **************************************************************/
***************
*** 193,197 ****
  /* connects to the database server */
  int ndo2db_db_connect(ndo2db_idi *idi){
- 	char connect_string[NDO2DB_INPUT_BUFFER];
  	int result=NDO_OK;
  
--- 193,196 ----

Index: ndomod.c
===================================================================
RCS file: /cvsroot/nagios/ndoutils/src/ndomod.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ndomod.c	11 Jul 2009 07:36:33 -0000	1.15
--- ndomod.c	11 Jul 2009 08:30:08 -0000	1.16
***************
*** 3,10 ****
   * NDOMOD.C - Nagios Data Output Event Broker Module
   *
!  * Copyright (c) 2005-2007 Ethan Galstad
   *
   * First Written: 05-19-2005
!  * Last Modified: 01-03-2009
   *
   *****************************************************************************/
--- 3,10 ----
   * NDOMOD.C - Nagios Data Output Event Broker Module
   *
!  * Copyright (c) 2005-2009 Ethan Galstad
   *
   * First Written: 05-19-2005
!  * Last Modified: 07-11-2009
   *
   *****************************************************************************/
***************
*** 580,587 ****
  /* used to rotate data sink file on a regular basis */
  int ndomod_rotate_sink_file(void *args){
  	char raw_command_line[MAX_COMMAND_BUFFER];
- 	char *raw_command_line_3x=NULL;
  	char processed_command_line[MAX_COMMAND_BUFFER];
  	char *processed_command_line_3x=NULL;
  	int early_timeout=FALSE;
  	double exectime;
--- 580,590 ----
  /* used to rotate data sink file on a regular basis */
  int ndomod_rotate_sink_file(void *args){
+ #ifdef BUILD_NAGIOS_2X
  	char raw_command_line[MAX_COMMAND_BUFFER];
  	char processed_command_line[MAX_COMMAND_BUFFER];
+ #else
+ 	char *raw_command_line_3x=NULL;
  	char *processed_command_line_3x=NULL;
+ #endif
  	int early_timeout=FALSE;
  	double exectime;

Index: ndo2db.c
===================================================================
RCS file: /cvsroot/nagios/ndoutils/src/ndo2db.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ndo2db.c	1 Jul 2009 19:34:41 -0000	1.15
--- ndo2db.c	11 Jul 2009 08:30:08 -0000	1.16
***************
*** 2,9 ****
   * NDO2DB.C - NDO To Database Daemon
   *
!  * Copyright (c) 2005-2008 Ethan Galstad 
   *
   * First Written: 05-19-2005
!  * Last Modified: 07-01-2009
   *
   **************************************************************/
--- 2,9 ----
   * NDO2DB.C - NDO To Database Daemon
   *
!  * Copyright (c) 2005-2009 Ethan Galstad
   *
   * First Written: 05-19-2005
!  * Last Modified: 07-11-2009
   *
   **************************************************************/
***************
*** 553,557 ****
  int ndo2db_daemonize(void){
  	pid_t pid=-1;
- 	int pidno=0;
  	int lockfile=0;
  	struct flock lock;
--- 553,556 ----
***************
*** 1608,1612 ****
  int ndo2db_end_input_data(ndo2db_idi *idi){
  	int result=NDO_OK;
- 	int x,y;
  
  	if(idi==NULL)
--- 1607,1610 ----

Index: sockdebug.c
===================================================================
RCS file: /cvsroot/nagios/ndoutils/src/sockdebug.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** sockdebug.c	3 Jan 2009 16:10:30 -0000	1.9
--- sockdebug.c	11 Jul 2009 08:30:08 -0000	1.10
***************
*** 2,6 ****
   * SOCKDEBUG.C - Socket Debugging Utility
   *
!  * Copyright (c) 2005-2007 Ethan Galstad 
   *
   * First Written: 05-13-2005
--- 2,6 ----
   * SOCKDEBUG.C - Socket Debugging Utility
   *
!  * Copyright (c) 2005-2009 Ethan Galstad
   *
   * First Written: 05-13-2005

Index: file2sock.c
===================================================================
RCS file: /cvsroot/nagios/ndoutils/src/file2sock.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** file2sock.c	3 Jan 2009 16:10:30 -0000	1.9
--- file2sock.c	11 Jul 2009 08:30:08 -0000	1.10
***************
*** 2,6 ****
   * FILE2SOCK.c - File to Socket Dump Utility
   *
!  * Copyright (c) 20052-2007 Ethan Galstad 
   * License: GPL v2
   *
--- 2,6 ----
   * FILE2SOCK.c - File to Socket Dump Utility
   *
!  * Copyright (c) 20052-2009 Ethan Galstad
   * License: GPL v2
   *