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

epsonds: changes to silence warnings. 

These caused the CI pipeline to fail.
merge-requests/875/head
Ralph Little 2025-05-29 08:30:08 -07:00
rodzic 55de3768c7
commit e8c8815a66
4 zmienionych plików z 10 dodań i 20 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
backend/epsonds-net.c
Wyświetl plik

@ -35,10 +35,10 @@
static ssize_t
epsonds_net_read_raw(epsonds_scanner *s, unsigned char *buf, ssize_t wanted,
epsonds_net_read_raw(epsonds_scanner *s, unsigned char *buf, size_t wanted,
SANE_Status *status)
{
DBG(15, "%s: wanted: %ld\n", __func__, wanted);
DBG(15, "%s: wanted: %zu\n", __func__, wanted);
if (wanted == 0)
{
@ -49,7 +49,7 @@ epsonds_net_read_raw(epsonds_scanner *s, unsigned char *buf, ssize_t wanted,
ssize_t read = -1;
read = epsonds_tcp_read(s, buf, wanted);
if (read < wanted) {
if ((read < 0) || ((size_t)read < wanted)) {
*status = SANE_STATUS_IO_ERROR;
}
@ -57,7 +57,7 @@ epsonds_net_read_raw(epsonds_scanner *s, unsigned char *buf, ssize_t wanted,
}
static ssize_t
epsonds_net_read_buf(epsonds_scanner *s, unsigned char *buf, ssize_t wanted,
epsonds_net_read_buf(epsonds_scanner *s, unsigned char *buf, size_t wanted,
SANE_Status * status)
{
ssize_t read = 0;
@ -87,14 +87,9 @@ epsonds_net_read_buf(epsonds_scanner *s, unsigned char *buf, ssize_t wanted,
}
ssize_t
epsonds_net_read(epsonds_scanner *s, unsigned char *buf, ssize_t wanted,
epsonds_net_read(epsonds_scanner *s, unsigned char *buf, size_t wanted,
SANE_Status * status)
{
if (wanted < 0) {
*status = SANE_STATUS_INVAL;
return 0;
}
size_t size;
ssize_t read = 0;
unsigned char header[12];

2
backend/epsonds-net.h
Wyświetl plik

@ -6,7 +6,7 @@
typedef void (*Device_Found_CallBack) (const char* name, const char* ip);
extern ssize_t epsonds_net_read(struct epsonds_scanner *s, unsigned char *buf, ssize_t buf_size,
extern ssize_t epsonds_net_read(struct epsonds_scanner *s, unsigned char *buf, size_t buf_size,
SANE_Status *status);
extern size_t epsonds_net_write(struct epsonds_scanner *s, unsigned int cmd, const unsigned char *buf,
size_t buf_size, size_t reply_len,

11
backend/epsonds-tcp.c
Wyświetl plik

@ -133,7 +133,7 @@ void epsonds_tcp_close(epsonds_scanner* s) {
s->fd = -1;
}
ssize_t epsonds_tcp_read(epsonds_scanner* s, unsigned char *buf, ssize_t wanted) {
ssize_t epsonds_tcp_read(epsonds_scanner* s, unsigned char *buf, size_t wanted) {
ssize_t read = -1;
#ifdef HAVE_OPENSSL
@ -157,19 +157,14 @@ ssize_t epsonds_tcp_read(epsonds_scanner* s, unsigned char *buf, ssize_t wanted)
}
else {
size_t bytes_recv = 0;
ssize_t rc = 1;
if (wanted > SSIZE_MAX) {
errno = EINVAL;
return -1;
}
int rc = 1;
while (bytes_recv < wanted && rc > 0)
{
rc = BIO_read(s->cryptContext->bio, buf+bytes_recv, wanted-bytes_recv);
if (rc > 0)
bytes_recv += rc;
DBG(1, "wanted=%d, bytes_recv:%d, rc=%d\n", wanted, bytes_recv, rc);
DBG(1, "wanted=%zu, bytes_recv:%zu, rc=%d\n", wanted, bytes_recv, rc);
}
read = bytes_recv;

2
backend/epsonds-tcp.h
Wyświetl plik

@ -7,7 +7,7 @@
extern void epsonds_tcp_close(struct epsonds_scanner* s);
extern SANE_Status epsonds_tcp_open(struct epsonds_scanner* s, const char *host, int port);
extern ssize_t epsonds_tcp_read(struct epsonds_scanner* s, unsigned char *buf, ssize_t wanted);
extern ssize_t epsonds_tcp_read(struct epsonds_scanner* s, unsigned char *buf, size_t wanted);
extern ssize_t epsonds_tcp_write(struct epsonds_scanner* s, const unsigned char *buf, size_t count);
#endif