Initial move to common config code directory

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

diff --git a/src/server/common.h b/src/server/common.h
index 34361b9..1bdca84 100644 (file)
--- a/src/server/common.h
+++ b/src/server/common.h
@@ -17,10 +17,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 UNUSED(var)    unused__##var __attribute__((__unused__))
 
 // === STRUCTURES ===
 typedef struct sItem   tItem;
@@ -33,6 +31,7 @@ struct sItem
        char    *Name;  //!< Display Name
         int    Price;  //!< Price
         int    bHidden;        //!< Hidden item?
+        int    bDisabledi;     //!< Disabled Item
        
        tHandler        *Handler;       //!< Handler for the item
        short   ID;     //!< Item ID
@@ -70,9 +69,13 @@ extern int   giNumItems;
 extern tHandler        *gaHandlers[];
 extern int     giNumHandlers;
 extern int     giDebugLevel;
+extern int     gbNoCostMode;
 
 // === FUNCTIONS ===
+extern void    Items_UpdateFile(void);
+
 // --- Helpers --
+extern void    StartPeriodicThread(void);
 extern void    AddPeriodicFunction(void (*Fcn)(void));
 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);
@@ -81,13 +84,19 @@ extern char *mkstr(const char *Format, ...);
 
 // --- Dispense ---
 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);
 
 // --- Logging ---
+// to syslog
 extern void    Log_Error(const char *Format, ...);
 extern void    Log_Info(const char *Format, ...);
+// To stdout
+#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)
 
 #endif