X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_snack.c;h=e8b29ec6bfdc38cee3ce7dd364d83d0447c0918b;hb=b97adce8e46e69b3250f5497156554889acbdf12;hp=c1100cb434e4eb4e5f84797d408b7c491527615c;hpb=dfa4eb21fc9e7cc2bfa912581d38aaee04f3b990;p=tpg%2Fopendispense2.git

diff --git a/src/server/handler_snack.c b/src/server/handler_snack.c
index c1100cb..e8b29ec 100644
--- a/src/server/handler_snack.c
+++ b/src/server/handler_snack.c
@@ -37,18 +37,16 @@ regex_t	gSnack_ResponseRegex;
 // == CODE ===
 int Snack_InitHandler()
 {
-	giSnack_SerialFD = open(gsSnack_SerialPort, O_RDWR | O_NOCTTY | O_NONBLOCK);
+	giSnack_SerialFD = InitSerial(gsSnack_SerialPort, 9600);
 	if( giSnack_SerialFD == -1 ) {
 		fprintf(stderr, "ERROR: Unable to open snack serial port ('%s')\n", gsSnack_SerialPort);
 	}
 	
-	InitSerial(giSnack_SerialFD, 9600);
-	
 	regcomp(&gSnack_ResponseRegex, "^(\\d\\d\\d)(.*)$", REG_EXTENDED);
 	return 0;
 }
 
-int Snack_CanDispense(int User, int Item)
+int Snack_CanDispense(int UNUSED(User), int Item)
 {
 	// Sanity please
 	if( Item < 0 || Item > 99 )	return -1;
@@ -61,7 +59,7 @@ int Snack_CanDispense(int User, int Item)
 /**
  * \brief Actually do a dispense from the coke machine
  */
-int Snack_DoDispense(int User, int Item)
+int Snack_DoDispense(int UNUSED(User), int Item)
 {
 	char	tmp[32];
 	regmatch_t	matches[4];