From 120806fa38c14bfca0f9503b561baec6d1927e05 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sun, 1 Feb 2009 18:50:24 +0000 Subject: [PATCH] format fix and fix missing return --- ChangeLog | 2 ++ backend/hs2p-scsi.c | 4 ++-- backend/hs2p.c | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index adfe53c03..94dc52d6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ DYNAMIC_FLAG configuration. * acinclude.m4, sanei/sanei_jpeg.c: Don't compile sanei_jpeg if libjpeg is unavailable. + * backend/hs2p-scsi.c: format fix. + * backend/hs2p.c: fix missing return. 2009-01-31 Chris Bagwell * backend/Makefil.am: Add missing math library to coolscan2 diff --git a/backend/hs2p-scsi.c b/backend/hs2p-scsi.c index be70a9f82..82640e953 100644 --- a/backend/hs2p-scsi.c +++ b/backend/hs2p-scsi.c @@ -444,8 +444,8 @@ sense_handler (int __sane_unused__ scsi_fd, u_char * sense_buffer, void *sd) print_sense_data (DBG_LEVEL, (SENSE_DATA *) sense_buffer); /* store sense_buffer */ - DBG (DBG_info, ">> copying %d bytes from sense_buffer[] to sense_data\n", - sizeof (SENSE_DATA)); + DBG (DBG_info, ">> copying %lu bytes from sense_buffer[] to sense_data\n", + (u_long) sizeof (SENSE_DATA)); memcpy (sdp, sense_buffer, sizeof (SENSE_DATA)); if (DBG_LEVEL >= DBG_info) print_sense_data (DBG_LEVEL, sdp); diff --git a/backend/hs2p.c b/backend/hs2p.c index 1be87acd6..7c1782322 100644 --- a/backend/hs2p.c +++ b/backend/hs2p.c @@ -1891,6 +1891,7 @@ hs2p_open (HS2P_Scanner * s) return status; } DBG (DBG_proc, "<< hs2p_open\n"); + return SANE_STATUS_GOOD; } static SANE_Status