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

Merge branch '120-fix-all-compiler-warnings-on-the-debian-10-builds' into 'master' 

Fix umax_pp compiler warnings

See merge request sane-project/backends!259
merge-requests/213/head
Olaf Meeuwissen 2019-12-19 12:14:16 +00:00
rodzic 02251c6489 97dea94959
commit 3a4d5a002c
6 zmienionych plików z 34 dodań i 46 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

44
backend/umax_pp.c
Wyświetl plik

@ -202,33 +202,27 @@ umax_pp_attach (SANEI_Config * config, const char *devname)
SANE_Status status = SANE_STATUS_GOOD;
int ret, prt = 0, mdl;
char model[32];
char name[64];
char *val;
const char *name = NULL;
const char *val;
memset (name, 0, 64);
if ((strlen (devname) < 3))
if (!devname || (strlen (devname) < 3))
return SANE_STATUS_INVAL;
sanei_umax_pp_setastra (atoi((SANE_Char *) config->values[CFG_ASTRA]));
/* if the name begins with a slash, it's a device, else it's an addr */
if (devname != NULL)
if ((devname[0] == '/'))
{
if ((devname[0] == '/'))
{
strncpy (name, devname, 64);
}
else
{
if ((devname[0] == '0')
&& ((devname[1] == 'x') || (devname[1] == 'X')))
prt = strtol (devname + 2, NULL, 16);
else
prt = atoi (devname);
}
name = devname;
}
else
{
if ((devname[0] == '0')
&& ((devname[1] == 'x') || (devname[1] == 'X')))
prt = strtol (devname + 2, NULL, 16);
else
prt = atoi (devname);
}
for (i = 0; i < num_devices; i++)
{
@ -291,7 +285,7 @@ umax_pp_attach (SANEI_Config * config, const char *devname)
devname);
return SANE_STATUS_IO_ERROR;
}
sprintf (model, "Astra %dP", mdl);
snprintf (model, sizeof(model), "Astra %dP", mdl);
dev = malloc (sizeof (Umax_PP_Descriptor) * (num_devices + 1));
@ -315,12 +309,12 @@ umax_pp_attach (SANEI_Config * config, const char *devname)
num_devices++;
/* if there are user provided values, use them */
val=(SANE_Char *) config->values[CFG_NAME];
val=(const SANE_Char *) config->values[CFG_NAME];
if(strlen(val)==0)
dev->sane.name = strdup (devname);
else
dev->sane.name = strdup (val);
val=(SANE_Char *) config->values[CFG_VENDOR];
val=(const SANE_Char *) config->values[CFG_VENDOR];
if(strlen(val)==0)
dev->sane.vendor = strdup ("UMAX");
else
@ -347,11 +341,11 @@ umax_pp_attach (SANEI_Config * config, const char *devname)
dev->max_h_size = 2550;
dev->max_v_size = 3500;
}
val=(SANE_Char *) config->values[CFG_MODEL];
val=(const SANE_Char *) config->values[CFG_MODEL];
if(strlen(val)==0)
dev->sane.model = strdup (model);
dev->sane.model = strdup (model);
else
dev->sane.model = strdup (val);
dev->sane.model = strdup (val);
DBG (3, "umax_pp_attach: device %s attached\n", devname);

28
backend/umax_pp_low.c
Wyświetl plik

@ -924,7 +924,7 @@ sanei_parport_find_device (void)
int
sanei_umax_pp_initPort (int port, char *name)
sanei_umax_pp_initPort (int port, const char *name)
{
#ifndef IO_SUPPORT_MISSING
# ifdef HAVE_LINUX_PPDEV_H
@ -1027,26 +1027,20 @@ sanei_umax_pp_initPort (int port, char *name)
}
else
{
sprintf (strmodes, "\n");
if (modes & PARPORT_MODE_PCSPP)
sprintf (strmodes, "%s\t\tPARPORT_MODE_PCSPP\n",
strmodes);
if (modes & PARPORT_MODE_TRISTATE)
sprintf (strmodes, "%s\t\tPARPORT_MODE_TRISTATE\n",
strmodes);
if (modes & PARPORT_MODE_EPP)
sprintf (strmodes, "%s\t\tPARPORT_MODE_EPP\n", strmodes);
snprintf(strmodes, sizeof(strmodes),
"\n%s%s%s%s%s%s",
(modes & PARPORT_MODE_PCSPP)? "\t\tPARPORT_MODE_PCSPP\n": "",
(modes & PARPORT_MODE_TRISTATE)? "\t\tPARPORT_MODE_TRISTATE\n": "",
(modes & PARPORT_MODE_EPP)? "\t\tPARPORT_MODE_EPP\n": "",
(modes & PARPORT_MODE_ECP)? "\t\tPARPORT_MODE_ECP\n": "",
(modes & PARPORT_MODE_COMPAT)? "\t\tPARPORT_MODE_COMPAT\n": "",
(modes & PARPORT_MODE_DMA)? "\t\tPARPORT_MODE_DMA\n": "");
if (modes & PARPORT_MODE_ECP)
{
sprintf (strmodes, "%s\t\tPARPORT_MODE_ECP\n",
strmodes);
gECP = 1;
}
if (modes & PARPORT_MODE_COMPAT)
sprintf (strmodes, "%s\t\tPARPORT_MODE_COMPAT\n",
strmodes);
if (modes & PARPORT_MODE_DMA)
sprintf (strmodes, "%s\t\tPARPORT_MODE_DMA\n", strmodes);
DBG (32, "parport modes: %X\n", modes);
DBG (32, "parport modes: %s\n", strmodes);
if (!(modes & PARPORT_MODE_EPP)

2
backend/umax_pp_low.h
Wyświetl plik

@ -46,7 +46,7 @@
/*****************************************************************************/
/* set port to 'idle state' and get iopl */
/*****************************************************************************/
extern int sanei_umax_pp_initPort (int port, char *name);
extern int sanei_umax_pp_initPort (int port, const char *name);
extern int sanei_umax_pp_initScanner (int recover);
extern int sanei_umax_pp_initTransport (int recover);
extern int sanei_umax_pp_endSession (void);

2
backend/umax_pp_mid.c
Wyświetl plik

@ -199,7 +199,7 @@ sanei_umax_pp_model (int port, int *model)
}
int
sanei_umax_pp_attach (int port, char *name)
sanei_umax_pp_attach (int port, const char *name)
{
int recover = 0;

2
backend/umax_pp_mid.h
Wyświetl plik

@ -74,7 +74,7 @@
*/
extern int sanei_umax_pp_attach (int port, char *name);
extern int sanei_umax_pp_attach (int port, const char *name);
/*
recognizes 1220P from 2000P

2
tools/umax_pp.c
Wyświetl plik

@ -32,7 +32,7 @@ main (int argc, char **argv)
char dbgstr[80];
int probe = 0;
int port = 0;
char *name = NULL;
const char *name = NULL;
int scan = 0;
int lamp = -1;
int i;