Implemented the first version of the XML request. Fixed eXpat incompatability with XML_Get/SetUserData and the void* in the handler functions.

1 files changed, 7 insertions, 7 deletions

diff --git a/server/src/pracrod.cc b/server/src/pracrod.cc
index 7fce884..cd5bfe7 100644
--- a/server/src/pracrod.cc
+++ b/server/src/pracrod.cc
@@ -84,11 +84,11 @@ void reload(int fisk)
 {
   int port;
   printf("Reload!\n");
-  port = Pentominos::config()->lookup("port");
-  Pentominos::config()->reload();
+  port = config()->lookup("port");
+  config()->reload();
 
   { // Force wake the server process for reinitialization.
-    Pentominos::TCPSocket socket;
+    TCPSocket socket;
     socket.connect("localhost", port);
   }
 }
@@ -158,13 +158,13 @@ int main(int argc, char *argv[])
   char *cfname = NULL;
   if(!configfile) cfname = ETC"/pracrod.conf";
   else cfname = configfile;
-  Pentominos::Configuration conf(cfname);
-  Pentominos::initConfig(&conf);
+  Configuration conf(cfname);
+  initConfig(&conf);
 
   if(!user) {
     std::string userstr;
     try {
-      user = (char*)(const char*)Pentominos::config()->lookup("user");
+      user = (char*)(const char*)config()->lookup("user");
     } catch( ... ) {
       printf("User not found in config.\n");
     }
@@ -192,7 +192,7 @@ int main(int argc, char *argv[])
   if(!group) {
     std::string groupstr;
     try {
-      group = (char*)(const char*)Pentominos::config()->lookup("group");
+      group = (char*)(const char*)config()->lookup("group");
     } catch( ... ) {
       printf("Group not found in config.\n");
     }