[pisa-src] r1868 - in trunk: libpisa/global.h pisacd/cdconf.h pisacd/cdmain.c
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Fri, 27 Nov 2009 14:50:09 +0100
Author: biurrun
Date: Fri Nov 27 14:50:09 2009
New Revision: 1868
Log:
Move more pisacd-specific definitions to a more appropriate place.
Modified:
trunk/libpisa/global.h
trunk/pisacd/cdconf.h
trunk/pisacd/cdmain.c
Modified: trunk/libpisa/global.h
==============================================================================
--- trunk/libpisa/global.h Fri Nov 27 14:46:11 2009 (r1867)
+++ trunk/libpisa/global.h Fri Nov 27 14:50:09 2009 (r1868)
@@ -100,10 +100,6 @@
#define PISA_CONFDIR_PATH PISA_SYSCONFDIR
#define PISA_DIR_PERF_RESULTS PISA_SYSCONFDIR"/results"
-#define PISACD_CONFFILE "pisacd.conf"
-#define PISACD_CONFFILE_FULLPATH PISA_CONFDIR_PATH "/" PISACD_CONFFILE
-#define PISACD_STARTUP_SCRIPT PISA_CONFDIR_PATH "/pisacd.startup"
-
#define PISA_AUTHORIZED_HOSTS_CONFFILE "authorized_hosts.cfg"
#define PISA_AUTHORIZED_HOSTS_CONFFILE_FULLPATH PISA_CONFDIR_PATH "/"
PISA_AUTHORIZED_HOSTS_CONFFILE
Modified: trunk/pisacd/cdconf.h
==============================================================================
--- trunk/pisacd/cdconf.h Fri Nov 27 14:46:11 2009 (r1867)
+++ trunk/pisacd/cdconf.h Fri Nov 27 14:50:09 2009 (r1868)
@@ -20,6 +20,9 @@
#define PISA_CONF_PORT_CD 5006
+#define PISACD_CONFFILE "pisacd.conf"
+#define PISACD_CONFFILE_FULLPATH PISA_CONFDIR_PATH "/" PISACD_CONFFILE
+
/**
* Default port number of client daemon
*/
Modified: trunk/pisacd/cdmain.c
==============================================================================
--- trunk/pisacd/cdmain.c Fri Nov 27 14:46:11 2009 (r1867)
+++ trunk/pisacd/cdmain.c Fri Nov 27 14:50:09 2009 (r1868)
@@ -40,6 +40,7 @@
#include "performance/pisaperf.h"
#define PISACD_LOCK_FILE "/var/lock/pisacd.lock"
+#define PISACD_STARTUP_SCRIPT PISA_CONFDIR_PATH "/pisacd.startup"
/* TODO: ugly interface relying of global variables in libpisa */
extern pisa_conf_handle_func_set conf_handle_func_set;
Other related posts:
- » [pisa-src] r1868 - in trunk: libpisa/global.h pisacd/cdconf.h pisacd/cdmain.c - Diego Biurrun
