From 97dea949598220dba43fd1dcadf0f8930f81260f Mon Sep 17 00:00:00 2001 From: Ralph Little Date: Thu, 19 Dec 2019 12:14:16 +0000 Subject: [PATCH] Revert "plustex: suppressed format truncated compiler warning." This reverts commit cc7fbd35e535e22cd13cd58979921e0c01fb38b4 --- backend/umax_pp.c | 44 +++++++++++++++++++------------------------ backend/umax_pp_low.c | 28 +++++++++++---------------- backend/umax_pp_low.h | 2 +- backend/umax_pp_mid.c | 2 +- backend/umax_pp_mid.h | 2 +- tools/umax_pp.c | 2 +- 6 files changed, 34 insertions(+), 46 deletions(-) diff --git a/backend/umax_pp.c b/backend/umax_pp.c index c1fa93fbf..16adbe386 100644 --- a/backend/umax_pp.c +++ b/backend/umax_pp.c @@ -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); diff --git a/backend/umax_pp_low.c b/backend/umax_pp_low.c index 225f63ad5..ddcf3da56 100644 --- a/backend/umax_pp_low.c +++ b/backend/umax_pp_low.c @@ -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) diff --git a/backend/umax_pp_low.h b/backend/umax_pp_low.h index 5e986c0b3..253ef6a8b 100644 --- a/backend/umax_pp_low.h +++ b/backend/umax_pp_low.h @@ -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); diff --git a/backend/umax_pp_mid.c b/backend/umax_pp_mid.c index 5f9fd5e87..4b16745e7 100644 --- a/backend/umax_pp_mid.c +++ b/backend/umax_pp_mid.c @@ -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; diff --git a/backend/umax_pp_mid.h b/backend/umax_pp_mid.h index 5903a4524..97d1366d5 100644 --- a/backend/umax_pp_mid.h +++ b/backend/umax_pp_mid.h @@ -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 diff --git a/tools/umax_pp.c b/tools/umax_pp.c index 7b127e3d5..eabf900b9 100644 --- a/tools/umax_pp.c +++ b/tools/umax_pp.c @@ -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;