X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fcommon.h;h=8aaf4c055d9f2c5a0de058482bbf35d0d80ae90b;hb=f8ff5876b5787375fe629450d0c5d088965720d0;hp=932c00662904f6af97744a36860e8cc3b8013873;hpb=1cb4c25d8821698d15bcfe223ee510ebb1b972c2;p=tpg%2Fopendispense2.git

diff --git a/src/server/common.h b/src/server/common.h
index 932c006..8aaf4c0 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;
@@ -71,18 +74,17 @@ 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 ActualUser, int User, int Ammount, const char *ReasonGiven);
+extern int	DispenseDonate(int ActualUser, int User, 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