[Nagios-checkins] SF.net SVN: nagios:[2060] nagioscore/trunk/include

ageric at users.sourceforge.net ageric at users.sourceforge.net
Mon Aug 13 15:17:10 UTC 2012


Revision: 2060
          http://nagios.svn.sourceforge.net/nagios/?rev=2060&view=rev
Author:   ageric
Date:     2012-08-13 15:17:09 +0000 (Mon, 13 Aug 2012)
Log Message:
-----------
Combine common macro declarations

Both cgi's and core hade STATE_WARNING etc defined in their own
headers, but with identical values (and comments). This patch just
moves them to the common header and leaves it at that.

Disentangling the fact that HOST_UNREACHABLE etc has different
values is another beast best left to the glorious day when we no
longer need to worry about the UI at all.

Signed-off-by: Andreas Ericsson <ae at op5.se>

Modified Paths:
--------------
    nagioscore/trunk/include/cgiutils.h
    nagioscore/trunk/include/common.h
    nagioscore/trunk/include/nagios.h

Modified: nagioscore/trunk/include/cgiutils.h
===================================================================
--- nagioscore/trunk/include/cgiutils.h	2012-08-13 15:16:42 UTC (rev 2059)
+++ nagioscore/trunk/include/cgiutils.h	2012-08-13 15:17:09 UTC (rev 2060)
@@ -185,14 +185,6 @@
 #define PREVIOUS_PAGE_ICON		"b_prev2.png"
 
 
-	/************************** PLUGIN RETURN VALUES ****************************/
-
-#define STATE_OK		0
-#define STATE_WARNING		1
-#define STATE_CRITICAL		2
-#define STATE_UNKNOWN		3       /* changed from -1 on 02/24/2001 */
-
-
 	/********************* EXTENDED INFO CGI DISPLAY TYPES  *********************/
 
 #define DISPLAY_PROCESS_INFO		0

Modified: nagioscore/trunk/include/common.h
===================================================================
--- nagioscore/trunk/include/common.h	2012-08-13 15:16:42 UTC (rev 2059)
+++ nagioscore/trunk/include/common.h	2012-08-13 15:17:09 UTC (rev 2060)
@@ -25,21 +25,6 @@
 #define PROGRAM_VERSION "3.4.1"
 #define PROGRAM_MODIFICATION_DATE "05-11-2012"
 
-/*#define DEBUG_CHECK_IPC 1 */
-/*#define DEBUG_CHECK_IPC2 1*/
-
-
-
-/* daemon is thread safe */
-#ifdef NSCORE
-#ifndef _REENTRANT
-#define _REENTRANT
-#endif
-#ifndef _THREAD_SAFE
-#define _THREAD_SAFE
-#endif
-#endif
-
 /* Experimental performance tweaks - use with caution */
 #undef USE_MEMORY_PERFORMANCE_TWEAKS
 
@@ -47,7 +32,13 @@
 #define my_free(ptr) do { if(ptr) { free(ptr); ptr = NULL; } } while(0)
 
 
+/****************** SERVICE STATES ********************/
+#define STATE_OK			0
+#define STATE_WARNING			1
+#define STATE_CRITICAL			2
+#define STATE_UNKNOWN			3       /* changed from -1 on 02/24/2001 */
 
+
 /***************************** COMMANDS *********************************/
 
 #define CMD_NONE			0

Modified: nagioscore/trunk/include/nagios.h
===================================================================
--- nagioscore/trunk/include/nagios.h	2012-08-13 15:16:42 UTC (rev 2059)
+++ nagioscore/trunk/include/nagios.h	2012-08-13 15:17:09 UTC (rev 2060)
@@ -164,15 +164,6 @@
 
 
 
-	/****************** SERVICE STATES ********************/
-
-#define STATE_OK			0
-#define STATE_WARNING			1
-#define STATE_CRITICAL			2
-#define STATE_UNKNOWN			3       /* changed from -1 on 02/24/2001 */
-
-
-
 	/****************** FLAPPING TYPES ********************/
 
 #define HOST_FLAPPING                   0

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Nagios-commits mailing list