<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/991498d5fe9e5ff23c77a9803a43456e03e85d80">https://github.com/macports/macports-ports/commit/991498d5fe9e5ff23c77a9803a43456e03e85d80</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 991498d5fe9e5ff23c77a9803a43456e03e85d80
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Fri Oct 18 14:19:48 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> sane-backends: Rename send function to avoid conflict
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70941
</span>---
graphics/sane-backends/Portfile | 1 +
graphics/sane-backends/files/send.patch | 288 ++++++++++++++++++++++++++++++++
2 files changed, 289 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/sane-backends/Portfile b/graphics/sane-backends/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 144f545babd..c7df82eee29 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/sane-backends/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/sane-backends/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +39,7 @@ depends_run path:bin/pkg-config:pkgconfig
</span> depends_lib-append path:lib/libcrypto.dylib:openssl
patchfiles patch-configure.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ send.patch \
</span> patch-frontend-scanimage.c.diff
compiler.c_standard 1999
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/sane-backends/files/send.patch b/graphics/sane-backends/files/send.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a734fddcf53
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/sane-backends/files/send.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,288 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rename send() function as it conflicts with a system function. Fixes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: static declaration of 'send' follows non-static declaration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.com/sane-project/backends/-/commit/1b12daf3d521495c6fb325d82035a83f100e0cc1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- backend/epson.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ backend/epson.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -851,7 +851,7 @@ static EpsonHdrUnion command (Epson_Scanner * s, u_char * cmd, size_t cmd_size,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SANE_Status * status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static SANE_Status get_identity_information (SANE_Handle handle);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static SANE_Status get_identity2_information (SANE_Handle handle);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static int send (Epson_Scanner * s, void *buf, size_t buf_size,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int scanner_send (Epson_Scanner * s, void *buf, size_t buf_size,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SANE_Status * status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static ssize_t receive (Epson_Scanner * s, void *buf, ssize_t buf_size,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SANE_Status * status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -880,7 +880,7 @@ static void scan_finish (Epson_Scanner * s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-send (Epson_Scanner * s, void *buf, size_t buf_size, SANE_Status * status)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++scanner_send (Epson_Scanner * s, void *buf, size_t buf_size, SANE_Status * status)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DBG (3, "send buf, size = %lu\n", (u_long) buf_size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1072,12 +1072,12 @@ set_cmd (Epson_Scanner * s, u_char cmd, int val)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[0] = ESC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[1] = cmd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, params, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, params, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (SANE_STATUS_GOOD != (status = expect_ack (s)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[0] = val;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, params, 1, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, params, 1, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status = expect_ack (s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1151,7 +1151,7 @@ set_zoom (Epson_Scanner * s, int x_zoom, int y_zoom)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmd[0] = ESC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmd[1] = s->hw->cmd->set_zoom;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, cmd, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, cmd, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status = expect_ack (s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (status != SANE_STATUS_GOOD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1160,7 +1160,7 @@ set_zoom (Epson_Scanner * s, int x_zoom, int y_zoom)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[0] = x_zoom;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[1] = y_zoom;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, params, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, params, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status = expect_ack (s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1179,7 +1179,7 @@ set_resolution (Epson_Scanner * s, int xres, int yres)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[0] = ESC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[1] = s->hw->cmd->set_resolution;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, params, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, params, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status = expect_ack (s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (status != SANE_STATUS_GOOD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1190,7 +1190,7 @@ set_resolution (Epson_Scanner * s, int xres, int yres)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[2] = yres;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[3] = yres >> 8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, params, 4, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, params, 4, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status = expect_ack (s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1224,7 +1224,7 @@ set_scan_area (Epson_Scanner * s, int x, int y, int width, int height)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[0] = ESC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[1] = s->hw->cmd->set_scan_area;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, params, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, params, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status = expect_ack (s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (status != SANE_STATUS_GOOD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1238,7 +1238,7 @@ set_scan_area (Epson_Scanner * s, int x, int y, int width, int height)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[6] = height;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[7] = height >> 8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, params, 8, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, params, 8, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status = expect_ack (s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1267,7 +1267,7 @@ set_color_correction_coefficients (Epson_Scanner * s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[0] = ESC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[1] = cmd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, params, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, params, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (SANE_STATUS_GOOD != (status = expect_ack (s)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1285,7 +1285,7 @@ set_color_correction_coefficients (Epson_Scanner * s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cct[0], cct[1], cct[2], cct[3],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cct[4], cct[5], cct[6], cct[7], cct[8]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, cct, length, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, cct, length, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status = expect_ack (s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DBG (1, "set_color_correction_coefficients: ending=%d.\n", status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1376,11 +1376,11 @@ set_gamma_table (Epson_Scanner * s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, params, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, params, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (SANE_STATUS_GOOD != (status = expect_ack (s)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, gamma, length, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, gamma, length, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (SANE_STATUS_GOOD != (status = expect_ack (s)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1621,7 +1621,7 @@ reset (Epson_Scanner * s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, param, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, param, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status = expect_ack (s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (needToClose)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1658,7 +1658,7 @@ close_scanner (Epson_Scanner * s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ param[0] = ESC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ param[1] = s->hw->cmd->request_status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ param[2]='\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send(s,param,2,&status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send(s,param,2,&status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ receive(s,result,4,&status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1782,7 +1782,7 @@ feed (Epson_Scanner * s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[0] = cmd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, params, 1, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, params, 1, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (SANE_STATUS_GOOD != (status = expect_ack (s)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1824,7 +1824,7 @@ eject (Epson_Scanner * s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[0] = cmd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, params, 1, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, params, 1, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (SANE_STATUS_GOOD != (status = expect_ack (s)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1866,7 +1866,7 @@ command (Epson_Scanner * s, u_char * cmd, size_t cmd_size,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ head = &(hdrunion->hdr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, cmd, cmd_size, status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, cmd, cmd_size, status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (SANE_STATUS_GOOD != *status)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1874,7 +1874,7 @@ command (Epson_Scanner * s, u_char * cmd, size_t cmd_size,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it seems to fix the problem. It should not have any
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ill effects on other scanners. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *status = SANE_STATUS_GOOD;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, cmd, cmd_size, status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, cmd, cmd_size, status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (SANE_STATUS_GOOD != *status)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (EpsonHdrUnion) 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4958,7 +4958,7 @@ sane_start (SANE_Handle handle)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[0] = ESC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[1] = s->hw->cmd->request_extended_status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, params, 2, &status); /* send ESC f (request extended status) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, params, 2, &status); /* send ESC f (request extended status) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (SANE_STATUS_GOOD == status)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4999,7 +4999,7 @@ sane_start (SANE_Handle handle)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[0] = ESC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[1] = s->hw->cmd->request_condition;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, params, 2, &status); /* send request condition */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, params, 2, &status); /* send request condition */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (SANE_STATUS_GOOD != status)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5081,7 +5081,7 @@ sane_start (SANE_Handle handle)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[0] = ESC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[1] = s->hw->cmd->start_scanning;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, params, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, params, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (SANE_STATUS_GOOD != status)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5120,7 +5120,7 @@ sane_auto_eject (Epson_Scanner * s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params[0] = cmd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, params, 1, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, params, 1, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (SANE_STATUS_GOOD != (status = expect_ack (s)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5207,7 +5207,7 @@ read_data_block (Epson_Scanner * s, EpsonDataRec * result)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ param[0] = ESC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ param[1] = s->hw->cmd->start_scanning;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, param, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, param, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (SANE_STATUS_GOOD != status)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5347,7 +5347,7 @@ START_READ:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * send the ACK signal to the scanner in order to make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * it ready for the next data block.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, S_ACK, 1, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, S_ACK, 1, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * ... and request the next data block
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5388,7 +5388,7 @@ START_READ:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, S_ACK, 1, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, S_ACK, 1, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * ... and the last data block
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5460,7 +5460,7 @@ START_READ:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (s->canceling)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, S_CAN, 1, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, S_CAN, 1, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ expect_ack (s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *length = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5470,7 +5470,7 @@ START_READ:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return SANE_STATUS_CANCELLED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, S_ACK, 1, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, S_ACK, 1, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s->end = s->buf + buf_len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6132,7 +6132,7 @@ get_identity2_information (SANE_Handle handle)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ param[1] = s->hw->cmd->request_identity2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ param[2] = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, param, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, param, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (SANE_STATUS_GOOD != status)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6234,7 +6234,7 @@ request_focus_position (SANE_Handle handle, u_char * position)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ param[1] = s->hw->cmd->request_focus_position;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ param[2] = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, param, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, param, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (SANE_STATUS_GOOD != status)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6287,7 +6287,7 @@ request_push_button_status (SANE_Handle handle, SANE_Bool * theButtonStatus)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ param[1] = s->hw->cmd->request_push_button_status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ param[2] = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send (s, param, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scanner_send (s, param, 2, &status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (SANE_STATUS_GOOD != status)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span></pre><pre style='margin:0'>
</pre>