[pisa-src] r2283 - in trunk: libpisa/pisaconf.h pisacd/pisacd.c pisacd/pisaconftool.c pisasd/pisaconftool.c
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Thu, 15 Apr 2010 13:21:49 +0200
Author: biurrun
Date: Thu Apr 15 13:21:48 2010
New Revision: 2283
Log:
Factorize pisa_conf_dst_port declaration from multiple .c files to pisaconf.h.
Modified:
trunk/libpisa/pisaconf.h
trunk/pisacd/pisacd.c
trunk/pisacd/pisaconftool.c
trunk/pisasd/pisaconftool.c
Modified: trunk/libpisa/pisaconf.h
==============================================================================
--- trunk/libpisa/pisaconf.h Thu Apr 15 13:17:30 2010 (r2282)
+++ trunk/libpisa/pisaconf.h Thu Apr 15 13:21:48 2010 (r2283)
@@ -23,6 +23,8 @@
#define PISA_CONF_REQUEST_DEBUGMASK 3
#define PISA_CONF_REQUEST_SERVICE_ADD 4
+extern int pisa_conf_dst_port;
+
struct pisa_conf_debuglevel {
uint8_t level; /* use PISA_LOGDEBUG_* */
} __attribute__ ((packed));
Modified: trunk/pisacd/pisacd.c
==============================================================================
--- trunk/pisacd/pisacd.c Thu Apr 15 13:17:30 2010 (r2282)
+++ trunk/pisacd/pisacd.c Thu Apr 15 13:21:48 2010 (r2283)
@@ -46,7 +46,6 @@
/* TODO: ugly interface relying of global variables in libpisa */
extern struct pisa_conf_handle_func_set conf_handle_func_set;
-extern int pisa_conf_dst_port;
#define OPTS "f:p:q:bdVh"
Modified: trunk/pisacd/pisaconftool.c
==============================================================================
--- trunk/pisacd/pisaconftool.c Thu Apr 15 13:17:30 2010 (r2282)
+++ trunk/pisacd/pisaconftool.c Thu Apr 15 13:21:48 2010 (r2283)
@@ -11,7 +11,7 @@
* @date Aug. 2009
*/
-#include "libpisa/debug.h"
+#include "libpisa/pisaconf.h"
#include "cdconf.h"
#include "pisacdconf.h"
@@ -20,7 +20,6 @@
"\tservice\t\t: Add NAT mapping (HIT local-IPv4 remote-IPv4)\n"
;
-extern int pisa_conf_dst_port;
extern char *pisa_conf_usage_common;
int main(int argc, char *argv[])
Modified: trunk/pisasd/pisaconftool.c
==============================================================================
--- trunk/pisasd/pisaconftool.c Thu Apr 15 13:17:30 2010 (r2282)
+++ trunk/pisasd/pisaconftool.c Thu Apr 15 13:21:48 2010 (r2283)
@@ -12,7 +12,7 @@
* @date Aug. 2009
*/
-#include "libpisa/debug.h"
+#include "libpisa/pisaconf.h"
#include "sdconf.h"
#include "pisasdconf.h"
@@ -21,7 +21,6 @@
"\treload\t\t: Reload the PisaSD configuration.\n"
;
-extern int pisa_conf_dst_port;
extern char *pisa_conf_usage_common;
int main(int argc, char *argv[])
Other related posts:
- » [pisa-src] r2283 - in trunk: libpisa/pisaconf.h pisacd/pisacd.c pisacd/pisaconftool.c pisasd/pisaconftool.c - Diego Biurrun
