Removing explicit mentions to users in the cokebank

[tpg/opendispense2.git] / src / server / main.c

diff --git a/src/server/main.c b/src/server/main.c
index b23cee4..714f513 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -18,16 +18,16 @@
 #include <fcntl.h>
 #include <stdarg.h>
 #include <syslog.h>
+#include "../cokebank.h"
 
 // === IMPORTS ===
-extern void    Init_Cokebank(const char *Argument);    // cokebank.c
 extern void    Init_Handlers(void);
 extern void    Load_Itemlist(void);
 extern void    Server_Start(void);
 extern int     giServer_Port;
-extern char*   gsItemListFile;
-extern char*   gsCoke_SerialPort;
-extern char*   gsSnack_SerialPort;
+extern char    *gsItemListFile;
+extern char    *gsCoke_SerialPort;
+extern char    *gsSnack_SerialPort;
 
 // === GLOBALS ===
  int   giDebugLevel = 0;
@@ -85,7 +85,8 @@ int main(int argc, char *argv[])
        
        openlog("odispense2", 0, LOG_LOCAL4);
        
-       Init_Cokebank(gsCokebankPath);
+       if( Bank_Initialise(gsCokebankPath) )
+               return -1;
 
        Init_Handlers();