summaryrefslogtreecommitdiff
path: root/backend/mustek_scsi_pp.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
commit64ddd1a4dfcefd11f662f5cf4bb05b590d901a97 (patch)
tree4303648095deff998ae20c2393b56db527742ac9 /backend/mustek_scsi_pp.h
parent5793a221e112fa49073de0137d6bfa750a61b0a1 (diff)
parentecaaf250cb33ff61f37a7b441f2337584a655350 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/mustek_scsi_pp.h')
-rw-r--r--backend/mustek_scsi_pp.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/backend/mustek_scsi_pp.h b/backend/mustek_scsi_pp.h
index 363f2c0..f722fff 100644
--- a/backend/mustek_scsi_pp.h
+++ b/backend/mustek_scsi_pp.h
@@ -13,9 +13,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
As a special exception, the authors of SANE give permission for
additional uses of the libraries contained in this release of SANE.
@@ -96,7 +94,7 @@ static SANE_Status mustek_scsi_pp_test_ready (int fd);
*
* @return
* - SANE_STATUS_GOOD - on success
- * - SANE_STATUS_IO_ERROR - if an error occured during the dialog with the
+ * - SANE_STATUS_IO_ERROR - if an error occurred during the dialog with the
* device
*/
static SANE_Status mustek_scsi_pp_cmd (int fd, const void *src, size_t src_size,
@@ -113,7 +111,7 @@ static SANE_Status mustek_scsi_pp_cmd (int fd, const void *src, size_t src_size,
*
* @return
* - SANE_STATUS_GOOD - on success
- * - SANE_STATUS_IO_ERROR - if an error occured during the dialog with the
+ * - SANE_STATUS_IO_ERROR - if an error occurred during the dialog with the
* device
*/
static SANE_Status mustek_scsi_pp_rdata (int fd, int planes,