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/hp-scl.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'backend/hp-scl.c') diff --git a/backend/hp-scl.c b/backend/hp-scl.c index e58508b..f1813c7 100644 --- a/backend/hp-scl.c +++ b/backend/hp-scl.c @@ -339,7 +339,7 @@ hp_nonscsi_write (HpScsi this, hp_byte_t *data, size_t len, HpConnect connect) static SANE_Status hp_nonscsi_read (HpScsi this, hp_byte_t *data, size_t *len, HpConnect connect, - int UNUSEDARG isResponse) + int __sane_unused__ isResponse) {int n = -1; static int retries = -1; @@ -905,7 +905,7 @@ hp_scsi_scl(HpScsi this, HpScl scl, int val) RETURN_IF_FAIL( hp_scsi_need(this, 10) ); - /* Dont try to optimize SCL-commands like using *a1b0c5T */ + /* Don't try to optimize SCL-commands like using *a1b0c5T */ /* Some scanners have problems with it (e.g. HP Photosmart Photoscanner */ /* with window position/extent, resolution) */ count = sprintf((char *)this->bufp, "\033*%c%d%c", group, val, param); @@ -1011,7 +1011,7 @@ hp_scsi_read (HpScsi this, void * dest, size_t *len, int isResponse) static int signal_caught = 0; -static RETSIGTYPE +static void signal_catcher (int sig) { DBG(1,"signal_catcher(sig=%d): old signal_caught=%d\n",sig,signal_caught); @@ -1338,13 +1338,11 @@ static SANE_Status process_data (PROCDATA_HANDLE *ph, unsigned char *read_ptr, int nread) {int bytes_left; - HpProcessData *procdata; if (nread <= 0) return SANE_STATUS_GOOD; if (ph == NULL) return SANE_STATUS_INVAL; - procdata = &(ph->procdata); if ( ph->tmp_buf_len > 0 ) /* Something left ? */ { bytes_left = ph->tmp_buf_size - ph->tmp_buf_len; @@ -2083,7 +2081,7 @@ hp_scl_strerror (int errnum) case 1024: return "ADF Paper Jam"; case 1025: return "Home Position Missing"; case 1026: return "Paper Not Loaded"; - default: return "??Unkown Error??"; + default: return "??Unknown Error??"; } } -- 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/hp-scl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backend/hp-scl.c') diff --git a/backend/hp-scl.c b/backend/hp-scl.c index f1813c7..a7376e6 100644 --- a/backend/hp-scl.c +++ b/backend/hp-scl.c @@ -553,7 +553,7 @@ hp_scsi_close (HpScsi this, int completely) DBG(3, "scsi_close: not closing. Keep open\n"); return; } - + } assert(this->fd >= 0); -- cgit v1.2.3 From ffa8801644a7d53cc1c785e3450f794c07a14eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 2 Feb 2020 17:13:01 +0100 Subject: New upstream version 1.0.29 --- backend/hp-scl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'backend/hp-scl.c') diff --git a/backend/hp-scl.c b/backend/hp-scl.c index a7376e6..fae7f97 100644 --- a/backend/hp-scl.c +++ b/backend/hp-scl.c @@ -523,8 +523,8 @@ sanei_hp_nonscsi_new (HpScsi * newp, const char * devname, HpConnect connect) } /* For SCSI-devices we would have the inquire command here */ - strncpy ((char *)new->inq_data, "\003zzzzzzzHP ------ R000", - sizeof (new->inq_data)); + memcpy (new->inq_data, "\003zzzzzzzHP ------ R000", + sizeof (new->inq_data)); new->bufp = new->buf + HP_SCSI_CMD_LEN; new->devname = sanei_hp_alloc ( strlen ( devname ) + 1 ); -- cgit v1.2.3