Clean the headers

Author: jfsmig

CMakeLists.txt

@@ -96,6 +96,9 @@ set(CMAKE_LIBRARY_PATH "")
 set(CMAKE_INCLUDE_PATH "")
 include_directories(AFTER ${GLIB2_INCLUDE_DIRS})
 
+add_definitions(-DLOG_DOMAIN="gridinit")
+add_definitions(-DGRIDINIT_DOMAIN="gridinit")
+
 add_subdirectory(./lib)
 add_subdirectory(./main)
 

lib/CMakeLists.txt

@@ -5,9 +5,7 @@ add_library(gridinit-utils STATIC
 		uid.c
 		common.c
 		limits.c
-		children.c
-		gridinit-utils.h
-		gridinit-internals.h)
+		children.c)
 
 target_link_libraries(gridinit-utils
 		${GLIB2_LIBRARIES})

lib/children.c

@@ -17,10 +17,6 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
-
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
@@ -33,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <glib.h>
 
 #include "./gridinit-utils.h"
-#include "./gridinit-internals.h"
 
 time_t supervisor_default_delay_KILL = SUPERVISOR_DEFAULT_TIMEOUT_KILL;
 

lib/common.c

@@ -17,16 +17,11 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
-
-#include "./gridinit-utils.h"
-#include "./gridinit-internals.h"
-
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "./gridinit-utils.h"
+
 GError*
 g_error_printf(const char *dom, int code, const char *fmt, ...)
 {

lib/gridinit-internals.h

@@ -32,6 +32,25 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # include <sys/types.h>
 # include <unistd.h>
 
+# define GRID_LOGLVL_TRACE  (32 << G_LOG_LEVEL_USER_SHIFT)
+# define GRID_LOGLVL_DEBUG  (16 << G_LOG_LEVEL_USER_SHIFT)
+# define GRID_LOGLVL_INFO   (8  << G_LOG_LEVEL_USER_SHIFT)
+# define GRID_LOGLVL_NOTICE (4  << G_LOG_LEVEL_USER_SHIFT)
+# define GRID_LOGLVL_WARN   (2  << G_LOG_LEVEL_USER_SHIFT)
+# define GRID_LOGLVL_ERROR  (1  << G_LOG_LEVEL_USER_SHIFT)
+
+# define FATAL(Format,...)  g_log(GRIDINIT_DOMAIN, GRID_LOGLVL_ERROR,  Format, ##__VA_ARGS__)
+# define ALERT(Format,...)  g_log(GRIDINIT_DOMAIN, GRID_LOGLVL_ERROR,  Format, ##__VA_ARGS__)
+# define CRIT(Format,...)   g_log(GRIDINIT_DOMAIN, GRID_LOGLVL_ERROR,  Format, ##__VA_ARGS__)
+# define ERROR(Format,...)  g_log(GRIDINIT_DOMAIN, GRID_LOGLVL_ERROR,  Format, ##__VA_ARGS__)
+# define WARN(Format,...)   g_log(GRIDINIT_DOMAIN, GRID_LOGLVL_WARN,   Format, ##__VA_ARGS__)
+# define NOTICE(Format,...) g_log(GRIDINIT_DOMAIN, GRID_LOGLVL_NOTICE, Format, ##__VA_ARGS__)
+# define INFO(Format,...)   g_log(GRIDINIT_DOMAIN, GRID_LOGLVL_INFO,   Format, ##__VA_ARGS__)
+# define DEBUG(Format,...)  g_log(GRIDINIT_DOMAIN, GRID_LOGLVL_DEBUG,  Format, ##__VA_ARGS__)
+# define TRACE(Format,...)  g_log(GRIDINIT_DOMAIN, GRID_LOGLVL_TRACE,  Format, ##__VA_ARGS__)
+
+GError* g_error_printf(const char *dom, int code, const char *fmt, ...);
+
 extern time_t supervisor_default_delay_KILL;
 
 /* Children monitoring ----------------------------------------------------- */

lib/gridinit-utils.h

@@ -17,20 +17,15 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
-
-#include "./gridinit-utils.h"
-#include "./gridinit-internals.h"
-
 #include <string.h>
 #include <errno.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/resource.h>
 #include <unistd.h>
 
+#include "./gridinit-utils.h"
+
 static const char*
 get_rlimit_name(enum supervisor_limit_e what)
 {

lib/limits.c

@@ -17,20 +17,15 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
-
-#include "./gridinit-utils.h"
-#include "./gridinit-internals.h"
-
 #include <string.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <pwd.h>
 #include <grp.h>
 
+#include "./gridinit-utils.h"
+
 static volatile uid_t effective_uid = 0;
 static volatile uid_t effective_gid = 0;
 

lib/uid.c

@@ -17,21 +17,13 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
-#ifndef LOG_DOMAIN
-# define LOG_DOMAIN "gridinit"
-#endif
-
 #include <event.h>
 #include <glib.h>
 #include <gmodule.h>
 
 #include <gridinit-utils.h>
 #include "./gridinit_internals.h"
 #include "./gridinit_alerts.h"
-#include "../lib/gridinit-internals.h"
 
 static GModule *module = NULL;
 static struct gridinit_alert_handle_s *handle = NULL;

main/alerting.c

@@ -17,13 +17,6 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
-#ifndef LOG_DOMAIN
-# define LOG_DOMAIN "gridinit"
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
@@ -42,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <glib.h>
 
 #include "./gridinit_internals.h"
-#include "../lib/gridinit-internals.h"
+#include "../lib/gridinit-utils.h"
 
 static volatile int backlog_unix = 65536;
 static volatile int backlog_tcp = 4096;