From 58912f68c2489bcee787599837447e0d64dfd61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 24 May 2017 21:03:56 +0200 Subject: New upstream version 1.0.27 --- backend/epson2_net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'backend/epson2_net.c') diff --git a/backend/epson2_net.c b/backend/epson2_net.c index 911ce62..4b3e7e9 100644 --- a/backend/epson2_net.c +++ b/backend/epson2_net.c @@ -104,7 +104,7 @@ sanei_epson_net_read(Epson_Scanner *s, unsigned char *buf, ssize_t wanted, size = be32atoh(&header[6]); - DBG(23, "%s: wanted = %lu, available = %lu\n", __FUNCTION__, + DBG(23, "%s: wanted = %lu, available = %lu\n", __func__, (u_long) wanted, (u_long) size); *status = SANE_STATUS_GOOD; @@ -170,7 +170,7 @@ sanei_epson_net_write(Epson_Scanner *s, unsigned int cmd, const unsigned char *b } DBG(24, "%s: cmd = %04x, buf = %p, buf_size = %lu, reply_len = %lu\n", - __FUNCTION__, cmd, buf, (u_long) buf_size, (u_long) reply_len); + __func__, cmd, buf, (u_long) buf_size, (u_long) reply_len); memset(h1, 0x00, 12); memset(h2, 0x00, 8); -- cgit v1.2.3 From 1687222e1b9e74c89cafbb5910e72d8ec7bfd40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 31 Jul 2019 16:59:49 +0200 Subject: New upstream version 1.0.28 --- backend/epson2_net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'backend/epson2_net.c') diff --git a/backend/epson2_net.c b/backend/epson2_net.c index 4b3e7e9..8d0fe9e 100644 --- a/backend/epson2_net.c +++ b/backend/epson2_net.c @@ -124,7 +124,7 @@ sanei_epson_net_read(Epson_Scanner *s, unsigned char *buf, ssize_t wanted, if (read < 0) { return 0; } - + /* } else if (wanted < size && s->netlen == size) { */ } else { DBG(23, "%s: partial read\n", __func__); @@ -187,7 +187,7 @@ sanei_epson_net_write(Epson_Scanner *s, unsigned int cmd, const unsigned char *b DBG(24, "H1[0]: %02x %02x %02x %02x\n", h1[0], h1[1], h1[2], h1[3]); if((cmd >> 8) == 0x20) { - htobe32a(&h1[6], buf_size + 8); + htobe32a(&h1[6], buf_size + 8); htobe32a(&h2[0], buf_size); htobe32a(&h2[4], reply_len); -- cgit v1.2.3