rpms/sane-backends
7
0
Fork 0
Code Issues Pull Requests Releases Activity

more instances of ...->open() fixed

Browse Source
This commit is contained in:
Nils Philippsen 2007-08-08 13:02:12 +00:00
parent a4969b5269
commit 95bbfba5d2
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sane-backends-1.0.18-glibc-2.7.patch
View File

@ -1,5 +1,27 @@
--- sane-backends-1.0.18/sanei/sanei_scsi.c.glibc-2.7 2005-11-24 23:08:49.000000000 +0100
+++ sane-backends-1.0.18/sanei/sanei_scsi.c 2007-08-08 15:01:07.000000000 +0200
@@ -5028,7 +5028,7 @@ sanei_scsi_find_devices (const char *fin
(*plugInInterface)->Release (plugInInterface);
IOObjectRelease (scsiDevice);
- ioReturnValue = (*scsiDeviceInterface)->open (scsiDeviceInterface);
+ ioReturnValue = ((*scsiDeviceInterface)->open) (scsiDeviceInterface);
if (ioReturnValue != kIOReturnSuccess)
{
DBG (5, "Error opening SCSI interface (0x%08x)\n", ioReturnValue);
--- sane-backends-1.0.18/backend/pixma_common.c.glibc-2.7 2006-06-11 22:53:05.000000000 +0200
+++ sane-backends-1.0.18/backend/pixma_common.c 2007-08-08 15:01:18.000000000 +0200
@@ -449,7 +449,7 @@ pixma_open (unsigned devnr, pixma_t ** h
strncpy (s->id, pixma_get_device_id (devnr), sizeof (s->id));
s->ops = s->cfg->ops;
s->scanning = 0;
- error = s->ops->open (s);
+ error = (s->ops->open) (s);
if (error < 0)
goto rollback;
*handle = s;
--- sane-backends-1.0.18/backend/plustek_pp.c.glibc-2.7 2006-02-19 12:32:24.000000000 +0100 --- sane-backends-1.0.18/backend/plustek_pp.c.glibc-2.7 2006-02-19 12:32:24.000000000 +0100
+++ sane-backends-1.0.18/backend/plustek_pp.c 2007-08-08 14:34:45.000000000 +0200 +++ sane-backends-1.0.18/backend/plustek_pp.c 2007-08-08 14:56:45.000000000 +0200
@@ -258,7 +258,7 @@ static int drvopen( Plustek_Device *dev @@ -258,7 +258,7 @@ static int drvopen( Plustek_Device *dev
DBG( _DBG_INFO, "drvopen()\n" ); DBG( _DBG_INFO, "drvopen()\n" );
@ -9,3 +31,14 @@
tsecs = 0; tsecs = 0;
--- sane-backends-1.0.18/backend/mustek_pp.c.glibc-2.7 2005-04-16 15:06:37.000000000 +0200
+++ sane-backends-1.0.18/backend/mustek_pp.c 2007-08-08 15:01:30.000000000 +0200
@@ -1152,7 +1152,7 @@ sane_open (SANE_String_Const devicename,
}
- if ((status = dev->func->open (dev->port, dev->caps, &fd)) != SANE_STATUS_GOOD) {
+ if ((status = (dev->func->open) (dev->port, dev->caps, &fd)) != SANE_STATUS_GOOD) {
DBG (1, "sane_open: could not open device (%s)\n",
sane_strstatus (status));