mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Free devlist in sane_exit. Use "../include/sane/...".

DEVEL_2_0_BRANCH-1
Henning Geinitz 2001-05-06 19:08:13 +00:00
rodzic be8f64a8d6
commit 5bb971f671
1 zmienionych plików z 14 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

24
backend/net.c
Wyświetl plik

@ -45,11 +45,11 @@
#define NET_VERSION "1.0.2" #define NET_VERSION "1.0.2"
#ifdef _AIX #ifdef _AIX
# include "lalloca.h" /* MUST come first for AIX! */ # include "../include/lalloca.h" /* MUST come first for AIX! */
#endif #endif
#include "sane/config.h" #include "../include/sane/config.h"
#include "lalloca.h" #include "../include/lalloca.h"
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
@ -67,25 +67,26 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <netdb.h> /* OS/2 needs this _after_ <netinet/in.h>, grrr... */ #include <netdb.h> /* OS/2 needs this _after_ <netinet/in.h>, grrr... */
#include "sane/sane.h" #include "../include/sane/sane.h"
#include "sane/sanei.h" #include "../include/sane/sanei.h"
#include "sane/sanei_net.h" #include "../include/sane/sanei_net.h"
#include "sane/sanei_codec_bin.h" #include "../include/sane/sanei_codec_bin.h"
#include "net.h" #include "net.h"
#define BACKEND_NAME net #define BACKEND_NAME net
#include "sane/sanei_backend.h" #include "../include/sane/sanei_backend.h"
#ifndef PATH_MAX #ifndef PATH_MAX
# define PATH_MAX 1024 # define PATH_MAX 1024
#endif #endif
#include "sane/sanei_config.h" #include "../include/sane/sanei_config.h"
#define NET_CONFIG_FILE "net.conf" #define NET_CONFIG_FILE "net.conf"
static SANE_Auth_Callback auth_callback; static SANE_Auth_Callback auth_callback;
static Net_Device *first_device; static Net_Device *first_device;
static Net_Scanner *first_handle; static Net_Scanner *first_handle;
static const SANE_Device **devlist;
static int saned_port; static int saned_port;
static SANE_Status static SANE_Status
@ -388,6 +389,7 @@ sane_exit (void)
{ {
Net_Scanner *handle, *next_handle; Net_Scanner *handle, *next_handle;
Net_Device *dev, *next_device; Net_Device *dev, *next_device;
int i;
DBG (1, "sane_exit: exiting\n"); DBG (1, "sane_exit: exiting\n");
@ -418,6 +420,9 @@ sane_exit (void)
free(dev->name); free(dev->name);
free (dev); free (dev);
} }
if (devlist)
for (i = 0; devlist[i]; ++i)
free ((void *) devlist[i]);
} }
/* Note that a call to get_devices() implies that we'll have to /* Note that a call to get_devices() implies that we'll have to
@ -430,7 +435,6 @@ SANE_Status
sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only) sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
{ {
static int devlist_size = 0, devlist_len = 0; static int devlist_size = 0, devlist_len = 0;
static const SANE_Device **devlist;
static const SANE_Device *empty_devlist[1] = { 0 }; static const SANE_Device *empty_devlist[1] = { 0 };
SANE_Get_Devices_Reply reply; SANE_Get_Devices_Reply reply;
SANE_Status status; SANE_Status status;