Free devlist on exit. Undef MIN and MAX macros before defining them.

Henning Meier-Geinitz <henning@meier-geinitz.de>

backend/mustek_usb.c

@@ -46,7 +46,7 @@
    This file implements a SANE backend for Mustek 1200UB and similar 
    USB flatbed scanners.  */
 
-#define BUILD 13
+#define BUILD 14
 
 #include "../include/sane/config.h"
 
@@ -84,6 +84,7 @@
 static SANE_Int num_devices;
 static Mustek_Usb_Device *first_dev;
 static Mustek_Usb_Scanner *first_handle;
+static const SANE_Device **devlist = 0;
 
 /* Maximum amount of data read in one turn from USB */
 static SANE_Word max_block_size = 8 * 1024;
@@ -938,13 +939,16 @@ sane_exit (void)
       free (dev);
     }
   first_dev = 0;
+  if (devlist)
+    free (devlist);
+  devlist = 0;
+
   DBG (5, "sane_exit: exit\n");
 }
 
 SANE_Status
 sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
 {
-  static const SANE_Device **devlist = 0;
   Mustek_Usb_Device *dev;
   SANE_Int dev_num;
 

backend/mustek_usb_low.h

@@ -56,6 +56,12 @@
 
 
 /* calculate the minimum/maximum values */
+#if defined(MIN)
+#undef MIN
+#endif
+#if defined(MAX)
+#undef MAX
+#endif
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))
 /* return the lower/upper 8 bits of a 16 bit word */

doc/descriptions/mustek_usb.desc

@@ -1,6 +1,6 @@
 :backend "mustek_usb"
 :status :beta
-:version "1.0-113"
+:version "1.0-114"
 :manpage "sane-mustek_usb"
 :url "http://www.meier-geinitz.de/sane/"
 

doc/mustek_usb/mustek_usb.CHANGES

@@ -1,5 +1,15 @@
 CHANGES for the SANE Mustek USB backend
 
+2002-04-24:
+  * Release of version 1.0-14. 
+
+2002-04-24:
+  * Undef MIN and MAX if they are defined in mustek_usb_low.h to avoid
+    warnings.
+
+2002-04-23:
+  * Free devlist in sane_exit.
+
 2002-04-10:
   * Release of version 1.0-13.