X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Fcommon.h;h=ec9e38acc2148159cc87edbe1b562b6789acdd1f;hb=ce80b78096596740cecfdae20d72d12accfa495e;hp=0d97ad5f968e465f579757a773b3a5db140d1eb2;hpb=d40b4a892a6b06e2ef0cb72e90ebf7b023577d03;p=tpg%2Fopendispense2.git

diff --git a/src/server/common.h b/src/server/common.h
index 0d97ad5..ec9e38a 100644
--- a/src/server/common.h
+++ b/src/server/common.h
@@ -10,6 +10,7 @@
 #define _COMMON_H_
 
 #include <regex.h>
+#include "../cokebank.h"
 
 // === CONSTANTS ===
 #define	DEFAULT_CONFIG_FILE	"/etc/opendispense/main.cfg"
@@ -19,6 +20,8 @@
 #define _EXPSTR(x)	#x
 #define EXPSTR(x)	_EXPSTR(x)
 
+#define UNUSED(var)	unused__##var __attribute__((__unused__))
+
 // === STRUCTURES ===
 typedef struct sItem	tItem;
 typedef struct sUser	tUser;
@@ -52,6 +55,10 @@ struct sHandler
 {
 	char	*Name;
 	 int	(*Init)(int NConfig, tConfigItem *Config);
+	/**
+	 * \brief Check if an item can be dispensed
+	 * \return Boolean Failure
+	 */
 	 int	(*CanDispense)(int User, int ID);
 	 int	(*DoDispense)(int User, int ID);
 };
@@ -67,18 +74,16 @@ extern int	giDebugLevel;
 // --- Helpers --
 extern void	CompileRegex(regex_t *Regex, const char *Pattern, int Flags);
 extern int	RunRegex(regex_t *regex, const char *string, int nMatches, regmatch_t *matches, const char *errorMessage);
+extern int	InitSerial(const char *Path, int BaudRate);
+extern char	*mkstr(const char *Format, ...);
 
 // --- Dispense ---
-extern int	DispenseItem(int User, tItem *Item);
+extern int	DispenseItem(int ActualUser, int User, tItem *Item);
+extern int	DispenseGive(int ActualUser, int SrcUser, int DestUser, int Ammount, const char *ReasonGiven);
+extern int	DispenseAdd(int User, int ByUser, int Ammount, const char *ReasonGiven);
 
 // --- Logging ---
 extern void	Log_Error(const char *Format, ...);
 extern void	Log_Info(const char *Format, ...);
 
-// --- Cokebank Functions ---
-extern int	Transfer(int SourceUser, int DestUser, int Ammount, const char *Reason);
-extern int	GetBalance(int User);
-extern char	*GetUserName(int User);
-extern int	GetUserID(const char *Username);
-
 #endif