summaryrefslogtreecommitdiff
path: root/backend/hp-scl.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:29:05 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:29:05 +0200
commit324a8a71bb7d9e4f8bc49b6bc47efaf9fb58282e (patch)
treebd2d48a139bfbe869f4f49359b63097931a45e7b /backend/hp-scl.c
parent2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff)
parent1edb02101a9306fc711cd422ed507d18165b1691 (diff)
Merge branch 'release/experimental/1.0.27-1_experimental1'experimental/1.0.27-1_experimental1
Diffstat (limited to 'backend/hp-scl.c')
-rw-r--r--backend/hp-scl.c10
1 files changed, 4 insertions, 6 deletions
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 <ESC>*a1b0c5T */
+ /* Don't try to optimize SCL-commands like using <ESC>*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??";
}
}