[Nagios-checkins] nagios/common macros.c, 1.38, 1.39 objects.c, 1.120, 1.121

Ethan Galstad egalstad at users.sourceforge.net
Tue Sep 21 15:05:33 UTC 2010


Update of /cvsroot/nagios/nagios/common
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5030/common

Modified Files:
	macros.c objects.c 
Log Message:
Code cleanup (compiler warnings) by Stephen Gran

Index: macros.c
===================================================================
RCS file: /cvsroot/nagios/nagios/common/macros.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** macros.c	1 Sep 2010 14:26:13 -0000	1.38
--- macros.c	21 Sep 2010 15:05:31 -0000	1.39
***************
*** 146,150 ****
  
  #ifdef NSCORE
! 			log_debug_info(DEBUGL_MACROS,2,"  Not currently in macro.  Running output (%d): '%s'\n",strlen(*output_buffer),*output_buffer);
  #endif
  
--- 146,150 ----
  
  #ifdef NSCORE
! 			log_debug_info(DEBUGL_MACROS,2,"  Not currently in macro.  Running output (%zd): '%s'\n",strlen(*output_buffer),*output_buffer);
  #endif
  
***************
*** 181,185 ****
  
  #ifdef NSCORE
! 				log_debug_info(DEBUGL_MACROS,2,"  Escaped $.  Running output (%d): '%s'\n",strlen(*output_buffer),*output_buffer);
  #endif
  
--- 181,185 ----
  
  #ifdef NSCORE
! 				log_debug_info(DEBUGL_MACROS,2,"  Escaped $.  Running output (%zd): '%s'\n",strlen(*output_buffer),*output_buffer);
  #endif
  
***************
*** 192,196 ****
  
  #ifdef NSCORE
! 				log_debug_info(DEBUGL_MACROS,2,"  Non-macro.  Running output (%d): '%s'\n",strlen(*output_buffer),*output_buffer);
  #endif
  
--- 192,196 ----
  
  #ifdef NSCORE
! 				log_debug_info(DEBUGL_MACROS,2,"  Non-macro.  Running output (%zd): '%s'\n",strlen(*output_buffer),*output_buffer);
  #endif
  
***************
*** 235,239 ****
  
  #ifdef NSCORE
! 						log_debug_info(DEBUGL_MACROS,2,"  Cleaned macro.  Running output (%d): '%s'\n",strlen(*output_buffer),*output_buffer);
  #endif
  						}
--- 235,239 ----
  
  #ifdef NSCORE
! 						log_debug_info(DEBUGL_MACROS,2,"  Cleaned macro.  Running output (%zd): '%s'\n",strlen(*output_buffer),*output_buffer);
  #endif
  						}
***************
*** 248,252 ****
  
  #ifdef NSCORE
! 						log_debug_info(DEBUGL_MACROS,2,"  Uncleaned macro.  Running output (%d): '%s'\n",strlen(*output_buffer),*output_buffer);
  #endif
  						}
--- 248,252 ----
  
  #ifdef NSCORE
! 						log_debug_info(DEBUGL_MACROS,2,"  Uncleaned macro.  Running output (%zd): '%s'\n",strlen(*output_buffer),*output_buffer);
  #endif
  						}
***************
*** 258,262 ****
  
  #ifdef NSCORE
! 				log_debug_info(DEBUGL_MACROS,2,"  Just finished macro.  Running output (%d): '%s'\n",strlen(*output_buffer),*output_buffer);
  #endif
  				}
--- 258,262 ----
  
  #ifdef NSCORE
! 				log_debug_info(DEBUGL_MACROS,2,"  Just finished macro.  Running output (%zd): '%s'\n",strlen(*output_buffer),*output_buffer);
  #endif
  				}

Index: objects.c
===================================================================
RCS file: /cvsroot/nagios/nagios/common/objects.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** objects.c	17 May 2009 12:54:28 -0000	1.120
--- objects.c	21 Sep 2010 15:05:31 -0000	1.121
***************
*** 181,185 ****
  	service *oa=NULL;
  	service *ob=NULL;
- 	int result=0;
  
  	oa=(service *)a;
--- 181,184 ----
***************
*** 326,330 ****
  	serviceescalation *oa=NULL;
  	serviceescalation *ob=NULL;
- 	int result=0;
  
  	oa=(serviceescalation *)a;
--- 325,328 ----
***************
*** 363,367 ****
  	servicedependency *oa=NULL;
  	servicedependency *ob=NULL;
- 	int result=0;
  
  	oa=(servicedependency *)a;
--- 361,364 ----





More information about the Nagios-commits mailing list