summaryrefslogtreecommitdiff
path: root/backend/apple.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-10-08 12:32:49 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-10-08 12:32:49 +0200
commitcfd27ef2ad8b005fd47ab41ef29b71d9e3d48201 (patch)
tree56cb8849a5df91b19b72fd4f48c79c343cd9bc5e /backend/apple.c
parentba8d09abe681600aad991f4a75e904615b7ed29f (diff)
Imported Upstream version 1.0.25upstream/1.0.25
Diffstat (limited to 'backend/apple.c')
-rw-r--r--backend/apple.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/backend/apple.c b/backend/apple.c
index c806983..a8e9979 100644
--- a/backend/apple.c
+++ b/backend/apple.c
@@ -136,6 +136,7 @@
#include "apple.h"
+static const SANE_Device **devlist = 0;
static int num_devices;
static Apple_Device *first_dev;
static Apple_Scanner *first_handle;
@@ -1596,7 +1597,7 @@ init_options (Apple_Scanner * s)
s->opt[OPT_WAIT].title = "Wait";
s->opt[OPT_WAIT].desc = "You may issue the scan command but the actual "
"scan will not start unless you press the button in the front of the "
- "scanner. It is usefull feature when you want to make a network scan (?) "
+ "scanner. It is a useful feature when you want to make a network scan (?) "
"In the mean time you may halt your computer waiting for the SCSI bus "
"to be free. If this happens just press the scanner button.";
s->opt[OPT_WAIT].type = SANE_TYPE_BOOL;
@@ -1921,12 +1922,13 @@ sane_exit (void)
free ((void *) dev->sane.model);
free (dev);
}
+ if (devlist)
+ free (devlist);
}
SANE_Status
sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
{
- static const SANE_Device **devlist = 0;
Apple_Device *dev;
int i;