summaryrefslogtreecommitdiff
path: root/sanei/sanei_scsi.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-05-24 21:03:56 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-05-24 21:03:56 +0200
commit58912f68c2489bcee787599837447e0d64dfd61a (patch)
treedda50aadde35fe152da1a8d50769987ace0f1496 /sanei/sanei_scsi.c
parentcfd27ef2ad8b005fd47ab41ef29b71d9e3d48201 (diff)
New upstream version 1.0.27upstream/1.0.27
Diffstat (limited to 'sanei/sanei_scsi.c')
-rw-r--r--sanei/sanei_scsi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sanei/sanei_scsi.c b/sanei/sanei_scsi.c
index 6d171d3..2413d8f 100644
--- a/sanei/sanei_scsi.c
+++ b/sanei/sanei_scsi.c
@@ -96,7 +96,7 @@
#elif defined (HAVE__USR_SRC_LINUX_INCLUDE_SCSI_SG_H)
# define USE LINUX_INTERFACE
# include "/usr/src/linux/include/scsi/sg.h"
-#elif defined (HAVE_SYS_SCSICMD)
+#elif defined (HAVE_SYS_SCSICMD_H)
# define USE SCSO_OS5_INTERFACE
# include <sys/scsi.h>
# include <sys/scsicmd.h>
@@ -2719,7 +2719,7 @@ sanei_proc_scsi_find_devices (const char *findvendor, const char *findmodel,
int number, i, j, definedd;
char line[256], dev_name[128], *c1, *c2, ctmp;
- const char *string;
+ char *string;
FILE *proc_fp;
char *end;
struct
@@ -2818,7 +2818,7 @@ sanei_proc_scsi_find_devices (const char *findvendor, const char *findmodel,
while (!feof (proc_fp))
{
fgets (line, sizeof (line), proc_fp);
- string = sanei_config_skip_whitespace (line);
+ string = (char *) sanei_config_skip_whitespace (line);
while (*string)
{
@@ -2839,7 +2839,7 @@ sanei_proc_scsi_find_devices (const char *findvendor, const char *findmodel,
}
ctmp = *c2;
*c2 = 0;
- string = sanei_config_skip_whitespace (string);
+ string = (char *) sanei_config_skip_whitespace (string);
if (param[i].is_int)
{