(bugfix) Insufficient warning level to catch that bug

[tpg/opendispense2.git] / src / server / common.h

diff --git a/src/server/common.h b/src/server/common.h
index 74c42d9..34ae298 100644 (file)
--- a/src/server/common.h
+++ b/src/server/common.h
@@ -9,6 +9,8 @@
 #ifndef _COMMON_H_
 #define _COMMON_H_
 
+#include <stdbool.h>   // Because C
+
 #include <regex.h>
 #include "../cokebank.h"
 
@@ -17,12 +19,8 @@
 #define        DEFAULT_ITEM_FILE       "/etc/opendispense/items.cfg"
 
 // === HELPER MACROS ===
-#define _EXPSTR(x)     #x
-#define EXPSTR(x)      _EXPSTR(x)
-
-#define UNUSED(var)    unused__##var __attribute__((__unused__))
 
-#define ASSERT(cnd) do{if(!(cnd)){fprintf(stderr, "ASSERT failed at "__FILE__":"EXPSTR(__LINE__)" - "EXPSTR(cnd)"\n");exit(-1);}}while(0)
+#define UNUSED(var)    unused__##var __attribute__((__unused__))
 
 // === STRUCTURES ===
 typedef struct sItem   tItem;
@@ -73,7 +71,7 @@ extern int    giNumItems;
 extern tHandler        *gaHandlers[];
 extern int     giNumHandlers;
 extern int     giDebugLevel;
-extern int     gbNoCostMode;
+extern bool    gbNoCostMode;
 
 // === FUNCTIONS ===
 extern void    Items_UpdateFile(void);
@@ -91,7 +89,7 @@ extern int    DispenseItem(int ActualUser, int User, tItem *Item);
 extern int     DispenseRefund(int ActualUser, int DestUser, tItem *Item, int OverridePrice);
 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     DispenseSet(int ActualUser, int User, int Balance, const char *ReasonGiven);
+extern int     DispenseSet(int ActualUser, int User, int Balance, const char *ReasonGiven, int *OrigBalance);
 extern int     DispenseDonate(int ActualUser, int User, int Ammount, const char *ReasonGiven);
 extern int     DispenseUpdateItem(int User, tItem *Item, const char *NewName, int NewPrice);
 
@@ -103,12 +101,4 @@ extern void        Log_Info(const char *Format, ...);
 #define Debug_Notice(msg, v...)        fprintf(stderr, "%08llun: "msg"\n", (unsigned long long)time(NULL) ,##v)
 #define Debug_Debug(msg, v...) fprintf(stderr, "%08llud: "msg"\n", (unsigned long long)time(NULL) ,##v)
 
-// --- Config Database ---
-extern void    Config_ParseFile(const char *Filename);
-extern void    Config_AddValue(const char *Key, const char *Value);
-extern int     Config_GetValueCount(const char *KeyName);
-extern const char      *Config_GetValue(const char *KeyName, int Index);
-extern int     Config_GetValue_Bool(const char *KeyName, int Index);
-extern int     Config_GetValue_Int(const char *KeyName, int Index);
-
 #endif