[pisa-src] r1270 - in trunk: Makefile.am community-operator/co_client.c community-operator/co_server.c include/cfg.h include/config.h libpisa/config.c libpisa/hitlist.c pairing/accept.c pairing/common.c pairi...
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Thu, 22 Oct 2009 11:36:18 +0200
Author: biurrun
Date: Thu Oct 22 11:36:17 2009
New Revision: 1270
Log:
Rename config.h --> cfg.h.
config.h is the canonical name given to header files containing
project-specific configuration information as generated by
configure, while cfg.h is about handling PISA configuration files.
Added:
trunk/include/cfg.h (contents, props changed)
- copied, changed from r1269, trunk/include/config.h
Deleted:
trunk/include/config.h
Modified:
trunk/Makefile.am
trunk/community-operator/co_client.c
trunk/community-operator/co_server.c
trunk/libpisa/config.c
trunk/libpisa/hitlist.c
trunk/pairing/accept.c
trunk/pairing/common.c
trunk/pairing/libconfig_wrapper.c
trunk/pairing/management.c
trunk/pairing/packet_handler_accept.c
trunk/pisacd/cdconf.c
trunk/pisacd/cdservers.c
trunk/pisasd/sdclients.c
trunk/pisasd/sdconf.c
trunk/pisasd/sdmain.c
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am Wed Oct 21 18:39:04 2009 (r1269)
+++ trunk/Makefile.am Thu Oct 22 11:36:17 2009 (r1270)
@@ -29,7 +29,7 @@
include/ac_config.h \
include/arp.h \
include/checksum.h \
- include/config.h \
+ include/cfg.h \
include/conmgr.h \
include/crypto.h \
include/ctrlhandler.h \
Modified: trunk/community-operator/co_client.c
==============================================================================
--- trunk/community-operator/co_client.c Wed Oct 21 18:39:04 2009
(r1269)
+++ trunk/community-operator/co_client.c Thu Oct 22 11:36:17 2009
(r1270)
@@ -16,7 +16,7 @@
#include <time.h>
#include "co_common_packets.h"
-#include "config.h"
+#include "cfg.h"
#include "debug.h"
#ifdef CONFIG_PISA_WITH_HIPL
Modified: trunk/community-operator/co_server.c
==============================================================================
--- trunk/community-operator/co_server.c Wed Oct 21 18:39:04 2009
(r1269)
+++ trunk/community-operator/co_server.c Thu Oct 22 11:36:17 2009
(r1270)
@@ -14,7 +14,7 @@
#include "global.h"
#include "debug.h"
#include "co_common_packets.h"
-#include "config.h"
+#include "cfg.h"
#include "hitlist.h"
#include "hipl.h"
Copied and modified: trunk/include/cfg.h (from r1269, trunk/include/config.h)
==============================================================================
--- trunk/include/config.h Wed Oct 21 18:39:04 2009 (r1269, copy
source)
+++ trunk/include/cfg.h Thu Oct 22 11:36:17 2009 (r1270)
@@ -4,15 +4,15 @@
*/
/**
- * @file config.h
+ * @file cfg.h
* @brief header file for PISA configuration handling functions.
* Mainly dependendent of the libconfig 1.3 API.
* @author Wolfram Fischer <papierfalter@xxxxxxxxx>
* @date Jan. 2009
*/
-#ifndef PISA_CONFIG_H
-#define PISA_CONFIG_H
+#ifndef PISA_CFG_H
+#define PISA_CFG_H
#include <libconfig.h>
struct cfg_group;
@@ -56,4 +56,4 @@
config_setting_t *pisa_cfg_get_setting(const char *name);
-#endif /* PISA_CONFIG_H */
+#endif /* PISA_CFG_H */
Modified: trunk/libpisa/config.c
==============================================================================
--- trunk/libpisa/config.c Wed Oct 21 18:39:04 2009 (r1269)
+++ trunk/libpisa/config.c Thu Oct 22 11:36:17 2009 (r1270)
@@ -14,7 +14,7 @@
#include <libconfig.h>
-#include "config.h"
+#include "cfg.h"
#include "debug.h"
#include "util.h"
Modified: trunk/libpisa/hitlist.c
==============================================================================
--- trunk/libpisa/hitlist.c Wed Oct 21 18:39:04 2009 (r1269)
+++ trunk/libpisa/hitlist.c Thu Oct 22 11:36:17 2009 (r1270)
@@ -7,7 +7,7 @@
#include <stdlib.h>
#include <time.h>
-#include "config.h"
+#include "cfg.h"
#include "hitlist.h"
#include "util.h"
Modified: trunk/pairing/accept.c
==============================================================================
--- trunk/pairing/accept.c Wed Oct 21 18:39:04 2009 (r1269)
+++ trunk/pairing/accept.c Thu Oct 22 11:36:17 2009 (r1270)
@@ -12,7 +12,7 @@
*/
#include "global.h" /* it must be included before all other header files */
-#include "config.h"
+#include "cfg.h"
#include "hitlist.h"
#include "accept.h"
Modified: trunk/pairing/common.c
==============================================================================
--- trunk/pairing/common.c Wed Oct 21 18:39:04 2009 (r1269)
+++ trunk/pairing/common.c Thu Oct 22 11:36:17 2009 (r1270)
@@ -18,7 +18,7 @@
#include <time.h>
#include "common.h"
-#include "config.h"
+#include "cfg.h"
#include "libconfig_wrapper.h"
#include "common_headers.h"
Modified: trunk/pairing/libconfig_wrapper.c
==============================================================================
--- trunk/pairing/libconfig_wrapper.c Wed Oct 21 18:39:04 2009 (r1269)
+++ trunk/pairing/libconfig_wrapper.c Thu Oct 22 11:36:17 2009 (r1270)
@@ -12,7 +12,7 @@
*/
#include "libconfig_wrapper.h"
-#include "config.h"
+#include "cfg.h"
#include "hitlist.h"
#include "packet_handler_accept.h"
#include "common.h"
Modified: trunk/pairing/management.c
==============================================================================
--- trunk/pairing/management.c Wed Oct 21 18:39:04 2009 (r1269)
+++ trunk/pairing/management.c Thu Oct 22 11:36:17 2009 (r1270)
@@ -20,7 +20,7 @@
#include <fcntl.h>
#include "global.h" /* it must be included before all other header files */
-#include "config.h"
+#include "cfg.h"
#include "debug.h"
#include "common_headers.h"
#include "common.h"
Modified: trunk/pairing/packet_handler_accept.c
==============================================================================
--- trunk/pairing/packet_handler_accept.c Wed Oct 21 18:39:04 2009
(r1269)
+++ trunk/pairing/packet_handler_accept.c Thu Oct 22 11:36:17 2009
(r1270)
@@ -12,7 +12,7 @@
*/
#include "global.h" /* it must be included before all other header files */
-#include "config.h"
+#include "cfg.h"
#include "hitlist.h"
#include "packet_handler_accept.h"
Modified: trunk/pisacd/cdconf.c
==============================================================================
--- trunk/pisacd/cdconf.c Wed Oct 21 18:39:04 2009 (r1269)
+++ trunk/pisacd/cdconf.c Thu Oct 22 11:36:17 2009 (r1270)
@@ -11,7 +11,7 @@
*/
#include "debug.h"
-#include "config.h"
+#include "cfg.h"
#include "cdconf.h"
#include "util.h"
#include "cdctx.h"
Modified: trunk/pisacd/cdservers.c
==============================================================================
--- trunk/pisacd/cdservers.c Wed Oct 21 18:39:04 2009 (r1269)
+++ trunk/pisacd/cdservers.c Thu Oct 22 11:36:17 2009 (r1270)
@@ -13,7 +13,7 @@
#include "cdctx.h"
#include "cdregister.h"
#include "cdservers.h"
-#include "config.h"
+#include "cfg.h"
#include "nat.h"
/**
Modified: trunk/pisasd/sdclients.c
==============================================================================
--- trunk/pisasd/sdclients.c Wed Oct 21 18:39:04 2009 (r1269)
+++ trunk/pisasd/sdclients.c Thu Oct 22 11:36:17 2009 (r1270)
@@ -12,7 +12,7 @@
#include "sdconf.h"
#include "sdctx.h"
-#include "config.h"
+#include "cfg.h"
#include "conmgr.h"
#include "nat.h"
Modified: trunk/pisasd/sdconf.c
==============================================================================
--- trunk/pisasd/sdconf.c Wed Oct 21 18:39:04 2009 (r1269)
+++ trunk/pisasd/sdconf.c Thu Oct 22 11:36:17 2009 (r1270)
@@ -10,7 +10,7 @@
* @date Jan. 2009
*/
-#include "config.h"
+#include "cfg.h"
#include "debug.h"
#include "hitlist.h"
#include "sdconf.h"
Modified: trunk/pisasd/sdmain.c
==============================================================================
--- trunk/pisasd/sdmain.c Wed Oct 21 18:39:04 2009 (r1269)
+++ trunk/pisasd/sdmain.c Thu Oct 22 11:36:17 2009 (r1270)
@@ -23,7 +23,7 @@
#include <errno.h>
#include <unistd.h>
-#include "config.h"
+#include "cfg.h"
#include "socket.h"
#include "tunnel.h"
#include "util.h"
Other related posts:
- » [pisa-src] r1270 - in trunk: Makefile.am community-operator/co_client.c community-operator/co_server.c include/cfg.h include/config.h libpisa/config.c libpisa/hitlist.c pairing/accept.c pairing/common.c pairi... - Diego Biurrun
