From cc1776b57156dae335f64d97e9380c1889fbdde4 Mon Sep 17 00:00:00 2001 From: "m. allan noah" Date: Wed, 10 Feb 2010 22:38:37 -0500 Subject: [PATCH] don't fail if sanei_scsi_open gives smaller buffer than asked for minor doc updates --- ChangeLog | 4 ++++ backend/canon_dr.c | 3 ++- backend/fujitsu.c | 11 +++++++---- backend/kodak.c | 11 +++++++---- doc/descriptions/kodak.desc | 4 ++-- doc/sane-canon_dr.man | 4 ++-- doc/sane-fujitsu.man | 4 ++-- doc/sane-kodak.man | 7 +++---- 8 files changed, 29 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 897f6eef2..8ee730b8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ * backend/canon_dr.c, backend/cardscan.c, backend/epjitsu.c, backend/fujitsu.c, backend/kodak.c, po/Makefile.*: - enable translations of all static strings via SANE_I18N macro + - don't fail if sanei_scsi_open gives smaller buffer than asked for + * doc/descriptions/kodak.desc, doc/sane-canon_dr.man, + doc/sane-fujitsu.man, doc/sane-kodak.man: + - minor version number and text updates 2010-02-10 m. allan noah * acinclude.m4, configure: missing $ in variable expansion diff --git a/backend/canon_dr.c b/backend/canon_dr.c index f79db3f3a..4ace9be59 100644 --- a/backend/canon_dr.c +++ b/backend/canon_dr.c @@ -253,6 +253,8 @@ - reset some intermediate params between duplex sides v35 2010-02-09, MAN - cleanup #includes and copyright + - add SANE_I18N to static strings + - don't fail if scsi buffer is too small SANE FLOW DIAGRAM @@ -816,7 +818,6 @@ connect_fd (struct scanner *s) if(!ret && buffer_size != s->buffer_size){ DBG (5, "connect_fd: cannot get requested buffer size (%d/%d)\n", buffer_size, s->buffer_size); - ret = SANE_STATUS_NO_MEM; } } diff --git a/backend/fujitsu.c b/backend/fujitsu.c index cd561c163..f49e3394a 100644 --- a/backend/fujitsu.c +++ b/backend/fujitsu.c @@ -448,6 +448,8 @@ - use sanei_magic to provide software deskew, autocrop and despeckle v98 2010-02-09, MAN - clean up #include lines and copyright + - add SANE_I18N to static strings + - don't fail if scsi buffer is too small SANE FLOW DIAGRAM @@ -1039,10 +1041,11 @@ connect_fd (struct fujitsu *s) } else { DBG (15, "connect_fd: opening SCSI device\n"); - ret = sanei_scsi_open_extended (s->device_name, &(s->fd), sense_handler, s, &s->buffer_size); - if(ret == SANE_STATUS_GOOD && buffer_size != s->buffer_size){ - DBG (5, "connect_fd: cannot get requested buffer size (%d/%d)\n", buffer_size, s->buffer_size); - ret = SANE_STATUS_NO_MEM; + ret = sanei_scsi_open_extended (s->device_name, &(s->fd), sense_handler, s, + &s->buffer_size); + if(!ret && buffer_size != s->buffer_size){ + DBG (5, "connect_fd: cannot get requested buffer size (%d/%d)\n", + buffer_size, s->buffer_size); } } diff --git a/backend/kodak.c b/backend/kodak.c index b5d4b12d9..7fe9ab5b5 100644 --- a/backend/kodak.c +++ b/backend/kodak.c @@ -58,6 +58,9 @@ v6 2009-06-22, MAN - improved set_window() to build desciptor from scratch - initial release + v7 2010-02-10, MAN + - add SANE_I18N to static strings + - don't fail if scsi buffer is too small SANE FLOW DIAGRAM @@ -116,7 +119,7 @@ #include "kodak.h" #define DEBUG 1 -#define BUILD 6 +#define BUILD 7 /* values for SANE_DEBUG_KODAK env var: - errors 5 @@ -440,9 +443,9 @@ connect_fd (struct scanner *s) else { ret = sanei_scsi_open_extended (s->device_name, &(s->fd), sense_handler, s, &s->buffer_size); - if(ret == SANE_STATUS_GOOD && buffer_size != s->buffer_size){ - DBG (5, "connect_fd: cannot get requested buffer size (%d/%d)\n", buffer_size, s->buffer_size); - ret = SANE_STATUS_NO_MEM; + if(!ret && buffer_size != s->buffer_size){ + DBG (5, "connect_fd: cannot get requested buffer size (%d/%d)\n", + buffer_size, s->buffer_size); } else{ DBG (15, "connect_fd: opened SCSI device\n"); diff --git a/doc/descriptions/kodak.desc b/doc/descriptions/kodak.desc index 87c7235c0..6c221c4ae 100644 --- a/doc/descriptions/kodak.desc +++ b/doc/descriptions/kodak.desc @@ -1,8 +1,8 @@ :backend "kodak" :url "http://www.thebility.com/kodak/" -:version "6" +:version "7" :manpage "sane-kodak" -:comment "New backend for SANE release 1.0.21, see manpage" +:comment "Backend update for SANE release 1.0.21, see sane-kodak manpage" :devicetype :scanner :new :yes diff --git a/doc/sane-canon_dr.man b/doc/sane-canon_dr.man index dc83b9b46..cf59efadd 100644 --- a/doc/sane-canon_dr.man +++ b/doc/sane-canon_dr.man @@ -1,4 +1,4 @@ -.TH sane\-canon_dr 5 "09 Fev 2010" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" +.TH sane\-canon_dr 5 "10 Feb 2010" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" .IX sane\-canon_dr .SH NAME @@ -10,7 +10,7 @@ The library implements a SANE (Scanner Access Now Easy) backend which provides access to some Canon DR-series scanners. -This document describes backend version 35, which shipped with SANE 1.0.21cvs. +This document describes backend version 35, which shipped with SANE 1.0.21. .SH SUPPORTED HARDWARE This version has only been tested with a few scanner models. Please see diff --git a/doc/sane-fujitsu.man b/doc/sane-fujitsu.man index dbcab6eef..ef9b251c0 100644 --- a/doc/sane-fujitsu.man +++ b/doc/sane-fujitsu.man @@ -1,4 +1,4 @@ -.TH sane\-fujitsu 5 "09 Feb 2010" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" +.TH sane\-fujitsu 5 "10 Feb 2010" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" .IX sane\-fujitsu .SH NAME @@ -10,7 +10,7 @@ The library implements a SANE (Scanner Access Now Easy) backend which provides access to most Fujitsu flatbed and ADF scanners. -This document describes backend version 98, which shipped with SANE 1.0.21cvs. +This document describes backend version 98, which shipped with SANE 1.0.21. .SH SUPPORTED HARDWARE This version supports every known model which speaks the Fujitsu SCSI and diff --git a/doc/sane-kodak.man b/doc/sane-kodak.man index 94bc367d6..2566f3d2e 100644 --- a/doc/sane-kodak.man +++ b/doc/sane-kodak.man @@ -1,4 +1,4 @@ -.TH sane\-kodak 5 "22 Jun 2009" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" +.TH sane\-kodak 5 "10 Feb 2010" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" .IX sane\-kodak .SH NAME @@ -10,7 +10,7 @@ The library implements a SANE (Scanner Access Now Easy) backend which provides access to large Kodak flatbed and ADF scanners. -This document describes backend version 6, which shipped with SANE 1.0.21cvs. +This document describes backend version 7, which shipped with SANE 1.0.21. .SH SUPPORTED HARDWARE This version should support models which speak the Kodak SCSI and Firewire @@ -136,8 +136,7 @@ Kodak provided access to hardware, documentation and personnel. .SH "SEE ALSO" sane(7), -sane\-scsi(5), -sane\-avision(5) +sane\-scsi(5) .SH AUTHOR m. allan noah: