[hipl-commit] [trunk] Rev 3657: Cleaning up header files.
- From: Miika Komu <miika@xxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Wed, 17 Feb 2010 12:57:37 +0200
Committer: Miika Komu <miika@xxxxxx>
Date: Wed Feb 17 12:57:25 2010 +0200
Revision: 3657
Revision-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
Cleaning up header files.
Converted _FOO_H to FOO_H where applicable. Tab fixes to make commit work.
Modified:
M agent/str_var.h
M doc/doxygen.h
M hipd/dhtqueue.h
M hipd/hidb.h
M hipd/init.h
M hipd/nat.h
M lib/core/icomm.h
M lib/core/ife.h
M lib/core/kerncompat.h
M lib/core/protodefs.h
M lib/core/utils.h
M lib/gui/create.h
M lib/gui/events.h
M lib/gui/hipgui.h
M lib/gui/tools.h
M lib/ipsec/ipsec_strerror.h
M lib/ipsec/libpfkey.h
M lib/tool/lutil.h
M lib/tool/nlink.h
=== modified file 'agent/str_var.h'
--- agent/str_var.h 2010-02-10 20:46:32 +0000
+++ agent/str_var.h 2010-02-17 10:57:25 +0000
@@ -1,5 +1,5 @@
-#ifndef _STR_VAR_H
-#define _STR_VAR_H
+#ifndef STR_VAR_H
+#define STR_VAR_H
/*
* HIP Agent
*
@@ -32,4 +32,4 @@
int str_var_valid(const char *);
int str_var_empty(const char *);
-#endif /* _STR_VAR_H */
+#endif /* STR_VAR_H */
=== modified file 'doc/doxygen.h'
--- doc/doxygen.h 2010-02-11 17:21:17 +0000
+++ doc/doxygen.h 2010-02-17 10:57:25 +0000
@@ -1,5 +1,5 @@
-#ifndef _DOXYGEN_H
-#define _DOXYGEN_H
+#ifndef DOXYGEN_H
+#define DOXYGEN_H
/**
* @file
* There should be no need to include this file anywhere! This is only for
@@ -799,4 +799,4 @@
* E-FAILED, HIP exchange failed.
*/
-#endif /* _DOXYGEN_H */
+#endif /* DOXYGEN_H */
=== modified file 'hipd/dhtqueue.h'
--- hipd/dhtqueue.h 2010-02-10 22:32:46 +0000
+++ hipd/dhtqueue.h 2010-02-17 10:57:25 +0000
@@ -6,8 +6,8 @@
* @note Distributed under <a
href="http://www.gnu.org/licenses/gpl.txt";>GNU/GPL</a>
*/
-#ifndef _HIP_HIPQUEUE
-#define _HIP_HIPQUEUE
+#ifndef HIP_HIPQUEUE
+#define HIP_HIPQUEUE
int hip_init_dht_queue(void);
int hip_write_to_dht_queue(void *, int);
=== modified file 'hipd/hidb.h'
--- hipd/hidb.h 2010-02-16 08:35:10 +0000
+++ hipd/hidb.h 2010-02-17 10:57:25 +0000
@@ -1,5 +1,5 @@
-#ifndef _HIP_DB
-#define _HIP_DB
+#ifndef HIP_DB
+#define HIP_DB
#include <asm/types.h>
#include <sys/errno.h>
@@ -86,4 +86,4 @@
int hip_get_default_hit_msg(struct hip_common *msg);
int hip_get_default_lsi(struct in_addr *lsi);
-#endif /* _HIP_DB */
+#endif /* HIP_DB */
=== modified file 'hipd/init.h'
--- hipd/init.h 2010-02-11 11:37:12 +0000
+++ hipd/init.h 2010-02-17 10:57:25 +0000
@@ -1,5 +1,5 @@
-#ifndef _HIPD_INIT
-#define _HIPD_INIT
+#ifndef HIPD_INIT
+#define HIPD_INIT
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
@@ -42,10 +42,10 @@
/**
* Creates a UDP socket for NAT traversal.
*
- * @param hip_nat_sock_udp a pointer to the UDP socket.
- * @param sockaddr_in the address that will be used to create the
- * socket. If NULL is passed, INADDR_ANY is used.
- * @param is_output 1 if the socket is for output, otherwise 0
+ * @param hip_nat_sock_udp a pointer to the UDP socket.
+ * @param sockaddr_in the address that will be used to create the
+ * socket. If NULL is passed, INADDR_ANY is used.
+ * @param is_output 1 if the socket is for output, otherwise 0
*
* @return zero on success, negative error value on error.
*/
=== modified file 'hipd/nat.h'
--- hipd/nat.h 2010-02-10 22:32:46 +0000
+++ hipd/nat.h 2010-02-17 10:57:25 +0000
@@ -15,8 +15,8 @@
* @note Distributed under <a
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
* @note All Doxygen comments have been added in version 1.1.
*/
-#ifndef __NAT_H__
-#define __NAT_H__
+#ifndef NAT_H
+#define NAT_H
#include "lib/core/state.h"
@@ -44,4 +44,4 @@
hip_transform_suite_t hip_nat_set_control(hip_ha_t *entry,
hip_transform_suite_t mode);
int hip_user_nat_mode(int nat_mode);
hip_transform_suite_t hip_nat_get_control(hip_ha_t *entry);
-#endif /* __NAT_H__ */
+#endif /* NAT_H */
=== modified file 'lib/core/icomm.h'
--- lib/core/icomm.h 2010-02-10 23:55:24 +0000
+++ lib/core/icomm.h 2010-02-17 10:57:25 +0000
@@ -1,5 +1,5 @@
-#ifndef _HIP_ICOMM
-#define _HIP_ICOMM
+#ifndef HIP_ICOMM
+#define HIP_ICOMM
/* Workaround for kernels before 2.6.15.3. */
#ifndef IPV6_2292PKTINFO
@@ -256,4 +256,4 @@
};
typedef struct firewall_port_cache_hl firewall_port_cache_hl_t;
-#endif /* _HIP_ICOMM */
+#endif /* HIP_ICOMM */
=== modified file 'lib/core/ife.h'
--- lib/core/ife.h 2010-02-10 23:55:24 +0000
+++ lib/core/ife.h 2010-02-17 10:57:25 +0000
@@ -1,5 +1,5 @@
-#ifndef _HIP_IFE
-#define _HIP_IFE
+#ifndef HIP_CORE_IFE
+#define HIP_CORE_IFE
#define GOTO_OUT -3
/** A generic HIP error. This should be a value whose value does not overlap
@@ -95,4 +95,4 @@
/** @} */
-#endif /* _HIP_IFE */
+#endif /* HIP_CORE_IFE */
=== modified file 'lib/core/kerncompat.h'
--- lib/core/kerncompat.h 2010-02-10 23:55:24 +0000
+++ lib/core/kerncompat.h 2010-02-17 10:57:25 +0000
@@ -1,5 +1,5 @@
-#ifndef __HIP_KERN_COMPATIBILITY__
-#define __HIP_KERN_COMPATIBILITY__
+#ifndef HIP_KERN_COMPATIBILITY
+#define HIP_KERN_COMPATIBILITY
#include <netinet/in.h>
#include <sys/time.h>
@@ -68,4 +68,4 @@
#define write_unlock_irqrestore(a, b) do {} while (0)
#define read_unlock_irqrestore(a, b) do {} while (0)
-#endif /* __HIP_KERN_COMPATIBILITY__ */
+#endif /* HIP_KERN_COMPATIBILITY */
=== modified file 'lib/core/protodefs.h'
--- lib/core/protodefs.h 2010-02-12 10:47:40 +0000
+++ lib/core/protodefs.h 2010-02-17 10:57:25 +0000
@@ -2,8 +2,8 @@
* This file defines a Host Identity Protocol (HIP) header and parameter
* related constants and structures.
*/
-#ifndef _HIP_PROTODEFS
-#define _HIP_PROTODEFS
+#ifndef HIP_PROTODEFS
+#define HIP_PROTODEFS
#ifdef __KERNEL__
# include "usercompat.h"
@@ -179,7 +179,7 @@
#define HIP_PARAM_ECHO_REQUEST 63661
#define HIP_PARAM_RELAY_FROM 63998
#define HIP_PARAM_RELAY_TO 64002
-//#define HIP_PARAM_REG_FROM 64010
+//#define HIP_PARAM_REG_FROM 64010
#define HIP_PARAM_TO_PEER 64006
#define HIP_PARAM_FROM_PEER 64008
#define HIP_PARAM_ECHO_REQUEST_M 65332
@@ -1055,4 +1055,4 @@
} __attribute__ ((packed));
-#endif /* _HIP_PROTODEFS */
+#endif /* HIP_PROTODEFS */
=== modified file 'lib/core/utils.h'
--- lib/core/utils.h 2010-02-10 23:55:24 +0000
+++ lib/core/utils.h 2010-02-17 10:57:25 +0000
@@ -1,5 +1,5 @@
-#ifndef _HIP_UTILS
-#define _HIP_UTILS
+#ifndef HIP_CORE_UTILS
+#define HIP_CORE_UTILS
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -102,4 +102,4 @@
# define HIP_CREATE_FILE(x) open((x), O_RDWR | O_CREAT, 0644)
#endif
-#endif /* _HIP_UTILS */
+#endif /* HIP_CORE_UTILS */
=== modified file 'lib/gui/create.h'
--- lib/gui/create.h 2010-02-09 18:39:16 +0000
+++ lib/gui/create.h 2010-02-17 10:57:25 +0000
@@ -1,5 +1,5 @@
-#ifndef _CREATE_H
-#define _CREATE_H
+#ifndef HIP_GUI_CREATE_H
+#define HIP_GUI_CREATE_H
/*
* HIPL GTK GUI
*
@@ -14,4 +14,4 @@
int create_content_nhdlg(void);
int create_content_execdlg(void);
-#endif /* _CREATE_H */
+#endif /* HIP_GUI_CREATE_H */
=== modified file 'lib/gui/events.h'
--- lib/gui/events.h 2010-02-11 00:05:35 +0000
+++ lib/gui/events.h 2010-02-17 10:57:25 +0000
@@ -1,5 +1,5 @@
-#ifndef _EVENTS_H
-#define _EVENTS_H
+#ifndef HIP_GUI_EVENTS_H
+#define HIP_GUI_EVENTS_H
/*
* HIPL GTK GUI
*
@@ -69,4 +69,4 @@
void e_local_edit(GtkWidget *, char *);
-#endif /* _EVENTS_H */
+#endif /* HIP_GUI_EVENTS_H */
=== modified file 'lib/gui/hipgui.h'
--- lib/gui/hipgui.h 2010-02-11 00:05:35 +0000
+++ lib/gui/hipgui.h 2010-02-17 10:57:25 +0000
@@ -1,5 +1,5 @@
-#ifndef _GUIAPI_H
-#define _GUIAPI_H
+#ifndef GUIAPI_H
+#define GUIAPI_H
/*
* HIPL GTK GUI
*
@@ -45,4 +45,4 @@
/*! @} addtogroup libhipgui */
-#endif /* _GUIAPI_H */
+#endif /* GUIAPI_H */
=== modified file 'lib/gui/tools.h'
--- lib/gui/tools.h 2010-02-11 00:05:35 +0000
+++ lib/gui/tools.h 2010-02-17 10:57:25 +0000
@@ -1,5 +1,5 @@
-#ifndef _TOOLS_H
-#define _TOOLS_H
+#ifndef HIP_GUI_TOOLS_H
+#define HIP_GUI_TOOLS_H
/*
* HIPL GTK GUI
*
@@ -51,4 +51,4 @@
void exec_application(void);
-#endif /* _TOOLS_H */
+#endif /* HIP_GUI_TOOLS_H */
=== modified file 'lib/ipsec/ipsec_strerror.h'
--- lib/ipsec/ipsec_strerror.h 2010-02-11 00:21:24 +0000
+++ lib/ipsec/ipsec_strerror.h 2010-02-17 10:57:25 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_strerror.h,v 1.4 2006/09/09 16:22:09 manu Exp $ */
+/* $NetBSD: ipsec_strerror.h,v 1.4 2006/09/09 16:22:09 manu Exp $ */
/* Id: ipsec_strerror.h,v 1.4 2004/06/07 09:18:46 ludvigm Exp */
@@ -31,8 +31,8 @@
* SUCH DAMAGE.
*/
-#ifndef _IPSEC_STRERROR_H
-#define _IPSEC_STRERROR_H
+#ifndef IPSEC_STRERROR_H
+#define IPSEC_STRERROR_H
extern int __ipsec_errcode;
extern void __ipsec_set_strerror __P((const char *));
@@ -70,4 +70,4 @@
#define EIPSEC_PRIORITY_NOT_COMPILED 29 /*no priority support in
libipsec*/
#define EIPSEC_MAX 30 /*unknown error*/
-#endif /* _IPSEC_STRERROR_H */
+#endif /* IPSEC_STRERROR_H */
=== modified file 'lib/ipsec/libpfkey.h'
--- lib/ipsec/libpfkey.h 2010-02-11 00:21:24 +0000
+++ lib/ipsec/libpfkey.h 2010-02-17 10:57:25 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: libpfkey.h,v 1.12.4.1 2007/08/01 11:52:18 vanhu Exp $ */
+/*$NetBSD: libpfkey.h,v 1.12.4.1 2007/08/01 11:52:18 vanhu Exp $ */
/* Id: libpfkey.h,v 1.13 2005/12/04 20:26:43 manubsd Exp */
@@ -31,11 +31,11 @@
* SUCH DAMAGE.
*/
-#ifndef _LIBPFKEY_H
-#define _LIBPFKEY_H
+#ifndef LIBPFKEY_H
+#define LIBPFKEY_H
-#ifndef KAME_LIBPFKEY_H
-#define KAME_LIBPFKEY_H
+#ifndef KAMELIBPFKEY_H
+#define KAMELIBPFKEY_H
#define PRIORITY_LOW 0xC0000000
#define PRIORITY_DEFAULT 0x80000000
@@ -213,6 +213,6 @@
#endif
-#endif /* KAME_LIBPFKEY_H */
+#endif /* KAMELIBPFKEY_H */
-#endif /* _LIBPFKEY_H */
+#endif /* LIBPFKEY_H */
=== modified file 'lib/tool/lutil.h'
--- lib/tool/lutil.h 2010-02-16 18:56:04 +0000
+++ lib/tool/lutil.h 2010-02-17 10:57:25 +0000
@@ -7,8 +7,8 @@
* @note Distributed under
* <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
*/
-#ifndef _LIBINET6_UTIL_H
-#define _LIBINET6_UTIL_H
+#ifndef LIBINET6_UTIL_H
+#define LIBINET6_UTIL_H
#ifdef HAVE_CONFIG_H
#include "config.h"
=== modified file 'lib/tool/nlink.h'
--- lib/tool/nlink.h 2010-02-15 13:05:01 +0000
+++ lib/tool/nlink.h 2010-02-17 10:57:25 +0000
@@ -1,5 +1,5 @@
-#ifndef _HIP_NLINK_H
-#define _HIP_NLINK_H
+#ifndef HIP_NLINK_H
+#define HIP_NLINK_H
#include <stdio.h>
#include <stdint.h>
@@ -111,4 +111,4 @@
char *name, const unsigned char *key,
int key_len, int max);
-#endif /* _HIP_NLINK_H */
+#endif /* HIP_NLINK_H */
Other related posts:
- » [hipl-commit] [trunk] Rev 3657: Cleaning up header files. - Miika Komu
