--=-=-= Hi,
Attached is a patch to mark the functions in hp5400_sanei.c as static, so that hp5400 passes the libcheck. Builds fine with the patch applied, no reason to think it doesn't work too. Please test/comment so it can get applied to CVS, JB. -- Julien BLACHE <http://www.jblache.org> <[email protected]> GPG KeyID 0xF5D65169 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=hp5400_syms_static.patch Content-Description: Mark functions in hp5400_sanei.c as static SANE BUG #300975 Index: hp5400.c =================================================================== RCS file: /cvsroot/sane/sane-backends/backend/hp5400.c,v retrieving revision 1.5 diff -u -r1.5 hp5400.c --- hp5400.c 3 Oct 2004 13:00:49 -0000 1.5 +++ hp5400.c 5 Apr 2005 19:52:35 -0000 @@ -53,8 +53,8 @@ #include "../include/sane/config.h" -#include "hp5400.h" #include "hp5400_debug.h" +#include "hp5400.h" #include "../include/sane/config.h" #include "../include/sane/sane.h" Index: hp5400_sanei.c =================================================================== RCS file: /cvsroot/sane/sane-backends/backend/hp5400_sanei.c,v retrieving revision 1.7 diff -u -r1.7 hp5400_sanei.c --- hp5400_sanei.c 3 Oct 2004 17:34:35 -0000 1.7 +++ hp5400_sanei.c 5 Apr 2005 19:52:36 -0000 @@ -117,7 +117,7 @@ } -int +HP5400_SANE_STATIC int hp5400_open (const char *filename) { int fd, iVendor, iProduct; Index: hp5400_xfer.h =================================================================== RCS file: /cvsroot/sane/sane-backends/backend/hp5400_xfer.h,v retrieving revision 1.4 diff -u -r1.4 hp5400_xfer.h --- hp5400_xfer.h 28 Jul 2003 07:14:16 -0000 1.4 +++ hp5400_xfer.h 5 Apr 2005 19:52:37 -0000 @@ -53,21 +53,21 @@ #include <stdio.h> -int hp5400_open (const char *filename); -void hp5400_close (int iHandle); +HP5400_SANE_STATIC int hp5400_open (const char *filename); +HP5400_SANE_STATIC void hp5400_close (int iHandle); -int hp5400_command_verify (int iHandle, int iCmd); -int hp5400_command_read (int iHandle, int iCmd, int iLen, void *pbData); -int hp5400_command_read_noverify (int iHandle, int iCmd, int iLen, - void *pbData); -int hp5400_command_write (int iHandle, int iCmd, int iLen, void *pbData); -void hp5400_command_write_noverify (int fd, int iValue, void *pabData, - int iSize); -int hp5400_bulk_read (int iHandle, size_t size, int block, FILE * file); -int hp5400_bulk_read_block (int iHandle, int iCmd, void *cmd, int cmdlen, - void *buffer, int len); -int hp5400_bulk_command_write (int iHandle, int iCmd, void *cmd, int cmdlen, - int len, int block, char *data); -int hp5400_isOn (int iHandle); +HP5400_SANE_STATIC int hp5400_command_verify (int iHandle, int iCmd); +HP5400_SANE_STATIC int hp5400_command_read (int iHandle, int iCmd, int iLen, void *pbData); +HP5400_SANE_STATIC int hp5400_command_read_noverify (int iHandle, int iCmd, int iLen, + void *pbData); +HP5400_SANE_STATIC int hp5400_command_write (int iHandle, int iCmd, int iLen, void *pbData); +HP5400_SANE_STATIC void hp5400_command_write_noverify (int fd, int iValue, void *pabData, + int iSize); +HP5400_SANE_STATIC int hp5400_bulk_read (int iHandle, size_t size, int block, FILE * file); +HP5400_SANE_STATIC int hp5400_bulk_read_block (int iHandle, int iCmd, void *cmd, int cmdlen, + void *buffer, int len); +HP5400_SANE_STATIC int hp5400_bulk_command_write (int iHandle, int iCmd, void *cmd, int cmdlen, + int len, int block, char *data); +HP5400_SANE_STATIC int hp5400_isOn (int iHandle); #endif --=-=-=--
