Return SANE_STATUS_ACCESS_DENIED if access was not granted

instead of SANE_STATUS_IO_ERROR.
Henning Meier-Geinitz <henning@meier-geinitz.de>
DEVEL_2_0_BRANCH-1
Henning Geinitz 2002-01-06 21:04:43 +00:00
rodzic 565aaa0639
commit f330f0d15c
1 zmienionych plików z 5 dodań i 2 usunięć

Wyświetl plik

@ -152,7 +152,7 @@ connect_dev (Net_Device * dev)
struct sockaddr_in *sin;
SANE_Word version_code;
SANE_Init_Reply reply;
SANE_Status status;
SANE_Status status = SANE_STATUS_IO_ERROR;
SANE_Init_Req req;
#ifdef TCP_NODELAY
int on = 1;
@ -228,6 +228,7 @@ connect_dev (Net_Device * dev)
{
DBG (1, "connect_dev: argument marshalling error (%s)\n",
strerror (dev->wire.status));
status = SANE_STATUS_IO_ERROR;
goto fail;
}
@ -248,6 +249,7 @@ connect_dev (Net_Device * dev)
{
DBG (1, "connect_dev: major version mismatch: got %d, expected %d\n",
SANE_VERSION_MAJOR (version_code), V_MAJOR);
status = SANE_STATUS_IO_ERROR;
goto fail;
}
if (SANE_VERSION_BUILD (version_code) != SANEI_NET_PROTOCOL_VERSION
@ -256,6 +258,7 @@ connect_dev (Net_Device * dev)
DBG (1, "connect_dev: network protocol version mismatch: "
"got %d, expected %d\n",
SANE_VERSION_BUILD (version_code), SANEI_NET_PROTOCOL_VERSION);
status = SANE_STATUS_IO_ERROR;
goto fail;
}
dev->wire.version = SANE_VERSION_BUILD (version_code);
@ -266,7 +269,7 @@ fail:
DBG (2, "connect_dev: closing connection to %s\n", dev->name);
close (dev->ctl);
dev->ctl = -1;
return SANE_STATUS_IO_ERROR;
return status;
}
static SANE_Status