mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

* backend/*.[ch]: nearly every backend used V_MAJOR 

instead of SANE_CURRENT_MAJOR in sane_init()
* backend/snapscan.c: remove EXPECTED_VERSION check
since new SANE standard is forward compatible
merge-requests/1/head
m. allan noah 2008-11-26 21:21:31 +00:00
rodzic 9e0e272a9b
commit 91598aa800
82 zmienionych plików z 143 dodań i 134 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
ChangeLog
Wyświetl plik

@ -1,3 +1,9 @@
2008-11-26 m. allan noah <kitno455 a t gmail d o t com>
* backend/*.[ch]: nearly every backend used V_MAJOR
instead of SANE_CURRENT_MAJOR in sane_init()
* backend/snapscan.c: remove EXPECTED_VERSION check
since new SANE standard is forward compatible
2008-11-25 m. allan noah <kitno455 a t gmail d o t com>
* backend/canon_dr.[ch], backend/canon_dr-cmd.c,
doc/descriptions/canon_dr.desc: backend v5

2
backend/abaton.c
Wyświetl plik

@ -855,7 +855,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG_INIT ();
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open (ABATON_CONFIG_FILE);
if (!fp)

2
backend/agfafocus.c
Wyświetl plik

@ -1287,7 +1287,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
sanei_thread_init ();
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open ("agfafocus.conf");
if (!fp)

2
backend/apple.c
Wyświetl plik

@ -1871,7 +1871,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG_INIT ();
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open (APPLE_CONFIG_FILE);
if (!fp)

2
backend/artec.c
Wyświetl plik

@ -2590,7 +2590,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
strcpy (artec_model, "");
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
if (authorize)
DBG (7, "sane_init(), authorize callback specified as %p\n", (void *) authorize);

2
backend/artec_eplus48u.c
Wyświetl plik

@ -4448,7 +4448,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
auth = authorize;
if (version_code != NULL)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open (ARTEC48U_CONFIG_FILE);

2
backend/as6e.c
Wyświetl plik

@ -626,7 +626,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG_INIT ();
DBG (2, "sane_init (authorize = %p)\n", (void *) authorize);
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
/* fp = sanei_config_open (AS6E_CONFIG_FILE);*/
if (!fp)
{

4
backend/avision.c
Wyświetl plik

@ -7349,14 +7349,14 @@ sane_init (SANE_Int* version_code, SANE_Auth_Callback authorize)
#endif
DBG (3, "sane_init:(Version: %i.%i Build: %i)\n",
V_MAJOR, V_MINOR, BACKEND_BUILD);
SANE_CURRENT_MAJOR, V_MINOR, BACKEND_BUILD);
/* must come first */
sanei_usb_init ();
sanei_thread_init ();
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BACKEND_BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BACKEND_BUILD);
fp = sanei_config_open (AVISION_CONFIG_FILE);
if (fp <= (FILE*)0)

4
backend/bh.c
Wyświetl plik

@ -3152,11 +3152,11 @@ sane_init (SANE_Int *version_code, SANE_Auth_Callback authorize)
DBG_INIT();
DBG(3, "sane_init called\n");
DBG(1, "Bell+Howell SANE backend %d.%d build %d %s endian\n",
V_MAJOR, V_MINOR, BUILD,
SANE_CURRENT_MAJOR, V_MINOR, BUILD,
_is_host_little_endian() ? "little" : "big");
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
fp = sanei_config_open(BH_CONFIG_FILE);
if (fp)

2
backend/canon-sane.c
Wyświetl plik

@ -55,7 +55,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback UNUSEDARG authorize)
#endif
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open (CANON_CONFIG_FILE);
if (fp)

4
backend/canon630u.c
Wyświetl plik

@ -721,10 +721,10 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG (2, "sane_init: version_code %s 0, authorize %s 0\n",
version_code == 0 ? "=" : "!=", authorize == 0 ? "=" : "!=");
DBG (1, "sane_init: SANE Canon630u backend version %d.%d.%d from %s\n",
V_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
sanei_usb_init ();

4
backend/canon_dr.c
Wyświetl plik

@ -225,10 +225,10 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG (10, "sane_init: start\n");
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
DBG (5, "sane_init: canon_dr backend %d.%d.%d, from %s\n",
V_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
DBG (10, "sane_init: finish\n");

2
backend/canon_pp.c
Wyświetl plik

@ -155,7 +155,7 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
#endif
if(vc)
*vc = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*vc = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
DBG(2,"sane_init: >> ieee1284_find_ports\n");
/* Find lp ports */

4
backend/cardscan.c
Wyświetl plik

@ -282,10 +282,10 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
sanei_usb_init();
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
DBG (5, "sane_init: cardscan backend %d.%d.%d, from %s\n",
V_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
DBG (10, "sane_init: finish\n");

2
backend/coolscan.c
Wyświetl plik

@ -3248,7 +3248,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG (10, "sane_init\n");
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open (COOLSCAN_CONFIG_FILE);
if (!fp)

2
backend/coolscan2.c
Wyświetl plik

@ -346,7 +346,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
if (version_code)
*version_code =
SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
sanei_usb_init ();

2
backend/coolscan3.c
Wyświetl plik

@ -312,7 +312,7 @@ sane_init(SANE_Int * version_code, SANE_Auth_Callback authorize)
authorize = authorize; /* to shut up compiler */
if (version_code)
*version_code = SANE_VERSION_CODE(V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR, 0);
sanei_usb_init();

2
backend/dc210.c
Wyświetl plik

@ -665,7 +665,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
DBG_INIT ();
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open (DC210_CONFIG_FILE);

2
backend/dc240.c
Wyświetl plik

@ -822,7 +822,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback UNUSEDARG authorize)
DBG_INIT ();
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open (DC240_CONFIG_FILE);

2
backend/dc25.c
Wyświetl plik

@ -1845,7 +1845,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback UNUSEDARG authorize)
DBG_INIT ();
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open (DC25_CONFIG_FILE);

2
backend/dell1600n_net.c
Wyświetl plik

@ -88,7 +88,7 @@
#define MAX_SCANNERS 32
/* version number */
#define DRIVER_VERSION SANE_VERSION_CODE( V_MAJOR, V_MINOR, 0 )
#define DRIVER_VERSION SANE_VERSION_CODE( SANE_CURRENT_MAJOR, V_MINOR, 0 )
/* size of buffer for socket communication */
#define SOCK_BUF_SIZE 2048

4
backend/dll.c
Wyświetl plik

@ -614,11 +614,11 @@ init (struct backend *be)
if (status != SANE_STATUS_GOOD)
return status;
if (SANE_VERSION_MAJOR (version) != V_MAJOR)
if (SANE_VERSION_MAJOR (version) != SANE_CURRENT_MAJOR)
{
DBG (1,
"init: backend `%s' has a wrong major version (%d instead of %d)\n",
be->name, SANE_VERSION_MAJOR (version), V_MAJOR);
be->name, SANE_VERSION_MAJOR (version), SANE_CURRENT_MAJOR);
return SANE_STATUS_INVAL;
}
DBG (4, "init: backend `%s' is version %d.%d.%d\n", be->name,

2
backend/dmc.c
Wyświetl plik

@ -811,7 +811,7 @@ sane_init(SANE_Int *version_code, SANE_Auth_Callback authorize)
DBG_INIT();
if (version_code) {
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
}
fp = sanei_config_open(DMC_CONFIG_FILE);

4
backend/epjitsu.c
Wyświetl plik

@ -235,10 +235,10 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG (10, "sane_init: start\n");
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
DBG (5, "sane_init: epjitsu backend %d.%d.%d, from %s\n",
V_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
DBG (10, "sane_init: finish\n");

2
backend/epson.c
Wyświetl plik

@ -2655,7 +2655,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
#endif
if (version_code != NULL)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, SANE_EPSON_BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, SANE_EPSON_BUILD);
sanei_usb_init ();

2
backend/epson2.c
Wyświetl plik

@ -1588,7 +1588,7 @@ sane_init(SANE_Int * version_code, SANE_Auth_Callback authorize)
if (version_code != NULL)
*version_code =
SANE_VERSION_CODE(V_MAJOR, V_MINOR,
SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR,
SANE_EPSON2_BUILD);
sanei_usb_init();

4
backend/fujitsu.c
Wyświetl plik

@ -563,10 +563,10 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG (10, "sane_init: start\n");
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
DBG (5, "sane_init: fujitsu backend %d.%d.%d, from %s\n",
V_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
DBG (10, "sane_init: finish\n");

4
backend/genesys.c
Wyświetl plik

@ -5085,10 +5085,10 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG_INIT ();
DBG (DBG_init, "SANE Genesys backend version %d.%d build %d from %s\n",
V_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
DBG (DBG_proc, "sane_init: authorize %s null\n", authorize ? "!=" : "==");

2
backend/gphoto2.c
Wyświetl plik

@ -671,7 +671,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback UNUSEDARG authorize)
}
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open (GPHOTO2_CONFIG_FILE);

4
backend/gt68xx.c
Wyświetl plik

@ -1026,11 +1026,11 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
FILE *fp;
DBG_INIT ();
DBG (2, "SANE GT68xx backend version %d.%d build %d from %s\n", V_MAJOR,
DBG (2, "SANE GT68xx backend version %d.%d build %d from %s\n", SANE_CURRENT_MAJOR,
V_MINOR, BUILD, PACKAGE_STRING);
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
DBG (5, "sane_init: authorize %s null\n", authorize ? "!=" : "==");

10
backend/hp.c
Wyświetl plik

@ -49,7 +49,13 @@ static char *hp_backend_revision = "$Revision$";
V 1.06:
$Log$
Revision 1.21 2004/10/04 18:09:05 kig-guest
Revision 1.22 2008/11/26 21:21:25 kitno-guest
* backend/*.[ch]: nearly every backend used V_MAJOR
instead of SANE_CURRENT_MAJOR in sane_init()
* backend/snapscan.c: remove EXPECTED_VERSION check
since new SANE standard is forward compatible
Revision 1.21 2004-10-04 18:09:05 kig-guest
Rename global function hp_init_openfd to sanei_hp_init_openfd
Revision 1.20 2004/03/27 13:52:39 kig-guest
@ -816,7 +822,7 @@ sane_init (SANE_Int *version_code, SANE_Auth_Callback UNUSEDARG authorize)
hp_destroy();
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, VERSIO);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, VERSIO);
status = hp_init();
DBG(3, "sane_init will finish with %s\n", sane_strstatus (status));

2
backend/hp3500.c
Wyświetl plik

@ -260,7 +260,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
sanei_thread_init ();
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
sanei_usb_find_devices (0x03f0, 0x2205, attachScanner);
sanei_usb_find_devices (0x03f0, 0x2005, attachScanner);

2
backend/hp3900_sane.c
Wyświetl plik

@ -1797,7 +1797,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
/* Return backend version */
if (version_code != NULL)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
return SANE_STATUS_GOOD;
}

4
backend/hp4200.c
Wyświetl plik

@ -2378,12 +2378,12 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG (DBG_proc, "%s\n", me);
DBG (DBG_error, "SANE hp4200 backend version %d.%d build %d from %s\n",
V_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
/* put some version_code checks here */
if (NULL != version_code)
{
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
}
sanei_usb_init ();

4
backend/hp5400_sane.c
Wyświetl plik

@ -481,7 +481,7 @@ sane_init (SANE_Int * piVersion, SANE_Auth_Callback pfnAuth)
DBG_INIT ();
HP5400_DBG (DBG_MSG, "sane_init: SANE hp5400 backend version %d.%d-%d (from %s)\n",
V_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
sanei_usb_init ();
@ -529,7 +529,7 @@ sane_init (SANE_Int * piVersion, SANE_Auth_Callback pfnAuth)
if (piVersion != NULL)
{
*piVersion = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*piVersion = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
}

4
backend/hp5590.c
Wyświetl plik

@ -318,11 +318,11 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
DBG_INIT();
DBG (1, "SANE backed for HP 4570/5550/5590/7650 %u.%u.%u\n", V_MAJOR, V_MINOR, BUILD);
DBG (1, "SANE backed for HP 4570/5550/5590/7650 %u.%u.%u\n", SANE_CURRENT_MAJOR, V_MINOR, BUILD);
DBG (1, "(c) Ilia Sotnikov <hostcc@gmail.com>\n");
if (version_code)
*version_code = SANE_VERSION_CODE(V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR, BUILD);
sanei_usb_init();

2
backend/hpljm1005.c
Wyświetl plik

@ -387,7 +387,7 @@ sane_init (SANE_Int * version_code,
{
if (version_code != NULL)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
DBG_INIT();

4
backend/hpsj5s.c
Wyświetl plik

@ -169,11 +169,11 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG (2, "sane_init: version_code %s 0, authorize %s 0\n",
version_code == 0 ? "=" : "!=", authorize == 0 ? "=" : "!=");
DBG (1, "sane_init: SANE hpsj5s backend version %d.%d.%d\n",
V_MAJOR, V_MINOR, BUILD);
SANE_CURRENT_MAJOR, V_MINOR, BUILD);
/*Inform about supported version */
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
/*Open configuration file for this backend */
config_file = sanei_config_open (HPSJ5S_CONFIG_FILE);

4
backend/hs2p.c
Wyświetl plik

@ -1358,14 +1358,14 @@ sane_init (SANE_Int * version_code,
/*DBG (DBG_sane_init, "> sane_init (authorize = %p)\n", (void *) authorize); */
#if defined PACKAGE && defined VERSION
DBG (DBG_sane_init, "> sane_init: hs2p backend version %d.%d-%d ("
PACKAGE " " VERSION ")\n", V_MAJOR, V_MINOR, BUILD);
PACKAGE " " VERSION ")\n", SANE_CURRENT_MAJOR, V_MINOR, BUILD);
#endif
/*
sanei_thread_init ();
*/
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
if ((fp = sanei_config_open (HS2P_CONFIG_FILE)) != NULL)

4
backend/ibm.c
Wyświetl plik

@ -544,11 +544,11 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
#if defined PACKAGE && defined VERSION
DBG (2, "sane_init: ibm backend version %d.%d-%d ("
PACKAGE " " VERSION ")\n", V_MAJOR, V_MINOR, BUILD);
PACKAGE " " VERSION ")\n", SANE_CURRENT_MAJOR, V_MINOR, BUILD);
#endif
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open(IBM_CONFIG_FILE);
if (fp)

4
backend/leo.c
Wyświetl plik

@ -1300,13 +1300,13 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
DBG (DBG_sane_init, "sane_init\n");
DBG (DBG_error, "This is sane-leo version %d.%d-%d\n", V_MAJOR,
DBG (DBG_error, "This is sane-leo version %d.%d-%d\n", SANE_CURRENT_MAJOR,
V_MINOR, BUILD);
DBG (DBG_error, "(C) 2002 by Frank Zago\n");
if (version_code)
{
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
}
fp = sanei_config_open (LEO_CONFIG_FILE);

4
backend/lexmark.c
Wyświetl plik

@ -466,14 +466,14 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG_INIT ();
DBG (1, "SANE Lexmark backend version %d.%d-rc2-%d\n", V_MAJOR, V_MINOR, BUILD);
DBG (1, "SANE Lexmark backend version %d.%d-rc2-%d\n", SANE_CURRENT_MAJOR, V_MINOR, BUILD);
auth_callback = authorize;
DBG (2, "sane_init: version_code=%p\n", (void *) version_code);
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
#ifndef FAKE_USB
sanei_usb_init ();

4
backend/ma1509.c
Wyświetl plik

@ -1109,11 +1109,11 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
debug_level = 0;
#endif
DBG (2, "SANE ma1509 backend version %d.%d build %d from %s\n", V_MAJOR,
DBG (2, "SANE ma1509 backend version %d.%d build %d from %s\n", SANE_CURRENT_MAJOR,
V_MINOR, BUILD, PACKAGE_STRING);
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
DBG (4, "sane_init: authorize %s null\n", authorize ? "!=" : "==");

4
backend/matsushita.c
Wyświetl plik

@ -1713,13 +1713,13 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
DBG (DBG_sane_init, "sane_init\n");
DBG (DBG_error, "This is sane-matsushita version %d.%d-%d\n", V_MAJOR,
DBG (DBG_error, "This is sane-matsushita version %d.%d-%d\n", SANE_CURRENT_MAJOR,
V_MINOR, BUILD);
DBG (DBG_error, "(C) 2002 by Frank Zago\n");
if (version_code)
{
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
}
fp = sanei_config_open (MATSUSHITA_CONFIG_FILE);

2
backend/microtek.c
Wyświetl plik

@ -3064,7 +3064,7 @@ sane_init(SANE_Int *version_code, SANE_Auth_Callback authorize)
MICROTEK_MAJOR, MICROTEK_MINOR, MICROTEK_PATCH);
/* return the SANE version we got compiled under */
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
/* parse config file */
fp = sanei_config_open (MICROTEK_CONFIG_FILE);

2
backend/microtek2.c
Wyświetl plik

@ -455,7 +455,7 @@ sane_init(SANE_Int *version_code, SANE_Auth_Callback authorize)
MICROTEK2_MAJOR, MICROTEK2_MINOR, MICROTEK2_BUILD);
if ( version_code )
*version_code = SANE_VERSION_CODE(V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR, 0);
#ifdef HAVE_AUTHORIZATION
auth_callback = authorize;

4
backend/mustek.c
Wyświetl plik

@ -5186,11 +5186,11 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
debug_level = 0;
#endif
DBG (2, "SANE mustek backend version %d.%d build %d from %s\n", V_MAJOR,
DBG (2, "SANE mustek backend version %d.%d build %d from %s\n", SANE_CURRENT_MAJOR,
V_MINOR, BUILD, PACKAGE_STRING);
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
DBG (5, "sane_init: authorize %s null\n", authorize ? "!=" : "==");

2
backend/mustek_pp.c
Wyświetl plik

@ -728,7 +728,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG (3, "backend by Jochen Eisinger <jochen.eisinger@gmx.net>\n");
if (version_code != NULL)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, MUSTEK_PP_BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, MUSTEK_PP_BUILD);
sane_auth = authorize;

4
backend/mustek_usb.c
Wyświetl plik

@ -704,11 +704,11 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
FILE *fp;
DBG_INIT ();
DBG (2, "SANE Mustek USB backend version %d.%d build %d from %s\n", V_MAJOR,
DBG (2, "SANE Mustek USB backend version %d.%d build %d from %s\n", SANE_CURRENT_MAJOR,
V_MINOR, BUILD, PACKAGE_STRING);
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
DBG (5, "sane_init: authorize %s null\n", authorize ? "!=" : "==");

4
backend/mustek_usb2.c
Wyświetl plik

@ -2021,12 +2021,12 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG_INIT ();
DBG (DBG_FUNC, "sane_init: start\n");
DBG (DBG_ERR, "SANE Mustek USB2 backend version %d.%d build %d from %s\n",
V_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
num_devices = 1; /* HOLD: only one device in this backend */
if (version_code != NULL)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
DBG (DBG_INFO, "sane_init: authorize %s null\n", authorize ? "!=" : "==");

2
backend/nec.c
Wyświetl plik

@ -1897,7 +1897,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG (1, "sane_init: NEC (Ver %d.%d)\n", NEC_MAJOR, NEC_MINOR);
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open (NEC_CONFIG_FILE);
if (!fp)

2
backend/niash.c
Wyświetl plik

@ -834,7 +834,7 @@ sane_init (SANE_Int * piVersion, SANE_Auth_Callback pfnAuth)
if (piVersion != NULL)
{
*piVersion = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*piVersion = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
}
/* initialise transfer methods */

2
backend/pie.c
Wyświetl plik

@ -2939,7 +2939,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
DBG (DBG_sane_init, "sane_init() build %d\n", BUILD);
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
fp = sanei_config_open (PIE_CONFIG_FILE);
if (!fp)

2
backend/pint.c
Wyświetl plik

@ -576,7 +576,7 @@ sane_init (SANE_Int *version_code, SANE_Auth_Callback authorize)
DBG_INIT();
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open (PINT_CONFIG_FILE);
if (!fp)

2
backend/pixma.c
Wyświetl plik

@ -1019,7 +1019,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
if (!version_code)
return SANE_STATUS_INVAL;
myversion = 100 * PIXMA_VERSION_MAJOR + PIXMA_VERSION_MINOR;
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, myversion);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, myversion);
DBG_INIT ();
sanei_thread_init ();
pixma_set_debug_level (DBG_LEVEL);

2
backend/plustek.c
Wyświetl plik

@ -1466,7 +1466,7 @@ sane_init( SANE_Int *version_code, SANE_Auth_Callback authorize )
usbGetList( &usbDevs );
if( version_code != NULL )
*version_code = SANE_VERSION_CODE(V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open( PLUSTEK_CONFIG_FILE );

2
backend/plustek_pp.c
Wyświetl plik

@ -1168,7 +1168,7 @@ SANE_Status sane_init( SANE_Int *version_code, SANE_Auth_Callback authorize )
#endif
if( version_code != NULL )
*version_code = SANE_VERSION_CODE(V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open( PLUSTEK_CONFIG_FILE );

4
backend/pnm.c
Wyświetl plik

@ -509,10 +509,10 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG (2, "sane_init: version_code %s 0, authorize %s 0\n",
version_code == 0 ? "=" : "!=", authorize == 0 ? "=" : "!=");
DBG (1, "sane_init: SANE pnm backend version %d.%d.%d from %s\n",
V_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
return SANE_STATUS_GOOD;
}

2
backend/qcam.c
Wyświetl plik

@ -1463,7 +1463,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG (1, "sane_init: enter\n");
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open (QCAM_CONFIG_FILE);
if (!fp)

2
backend/ricoh.c
Wyświetl plik

@ -494,7 +494,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
#endif
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open(RICOH_CONFIG_FILE);
if (fp)

2
backend/rts8891_low.c
Wyświetl plik

@ -66,7 +66,7 @@ rts8891_low_init (void)
{
DBG_INIT ();
DBG (DBG_info, "RTS8891 low-level functions, version %d.%d-%d\n",
V_MAJOR, V_MINOR, RTS8891_BUILD);
SANE_CURRENT_MAJOR, V_MINOR, RTS8891_BUILD);
}

2
backend/rts88xx_lib.c
Wyświetl plik

@ -59,7 +59,7 @@ void
sanei_rts88xx_lib_init (void)
{
DBG_INIT ();
DBG (DBG_info, "RTS88XX library, version %d.%d-%d\n", V_MAJOR, V_MINOR,
DBG (DBG_info, "RTS88XX library, version %d.%d-%d\n", SANE_CURRENT_MAJOR, V_MINOR,
RTS88XX_LIB_BUILD);
}

2
backend/s9036.c
Wyświetl plik

@ -834,7 +834,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG_INIT ();
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open ("s9036.conf");
if (!fp)

4
backend/sceptre.c
Wyświetl plik

@ -1317,13 +1317,13 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
DBG (DBG_proc, "sane_init: enter\n");
DBG (DBG_error, "This is sane-sceptre version %d.%d-%d\n", V_MAJOR,
DBG (DBG_error, "This is sane-sceptre version %d.%d-%d\n", SANE_CURRENT_MAJOR,
V_MINOR, BUILD);
DBG (DBG_error, "(C) 2002 by Frank Zago\n");
if (version_code)
{
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
}
fp = sanei_config_open (SCEPTRE_CONFIG_FILE);

2
backend/sharp.c
Wyświetl plik

@ -2363,7 +2363,7 @@ sane_init (SANE_Int * version_code,
#endif
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open (SHARP_CONFIG_FILE);
if (!fp)

4
backend/sm3600.c
Wyświetl plik

@ -392,9 +392,9 @@ sane_init (SANE_Int *version_code, SANE_Auth_Callback authCB)
DBG(DEBUG_VERBOSE,"SM3600 init\n");
if (version_code)
{
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
DBG(DEBUG_VERBOSE,"SM3600 version: %x\n",
SANE_VERSION_CODE(V_MAJOR, V_MINOR, BUILD));
SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR, BUILD));
}
pdevFirst=NULL;

2
backend/sm3840.c
Wyświetl plik

@ -549,7 +549,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
{
DBG_INIT ();
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
if (authorize)
DBG (2, "Unused authorize\n");

25
backend/snapscan.c
Wyświetl plik

@ -77,7 +77,6 @@
#define PATH_MAX 1024
#endif
#define EXPECTED_MAJOR 1
#define MINOR_VERSION 4
#define BUILD 53
#define BACKEND_NAME snapscan
@ -678,21 +677,7 @@ SANE_Status sane_init (SANE_Int *version_code,
DBG (DL_CALL_TRACE, "%s\n", me);
DBG (DL_VERBOSE, "%s: Snapscan backend version %d.%d.%d\n",
me,
EXPECTED_MAJOR, MINOR_VERSION, BUILD);
/* version check */
if (SANE_CURRENT_MAJOR != EXPECTED_MAJOR)
{
DBG (DL_MAJOR_ERROR,
"%s: this version of the SnapScan backend is intended for use\n"
"with SANE major version %ld, but the major version of this SANE\n"
"release is %ld. Sorry, but you need a different version of\n"
"this backend.\n\n",
me,
(long) /*SANE_CURRENT_MAJOR */ V_MAJOR,
(long) EXPECTED_MAJOR);
return SANE_STATUS_INVAL;
}
SANE_CURRENT_MAJOR, MINOR_VERSION, BUILD);
if (version_code != NULL)
{
@ -1934,7 +1919,13 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
/*
* $Log$
* Revision 1.72 2008/05/15 12:50:24 ellert-guest
* Revision 1.73 2008/11/26 21:21:29 kitno-guest
* * backend/*.[ch]: nearly every backend used V_MAJOR
* instead of SANE_CURRENT_MAJOR in sane_init()
* * backend/snapscan.c: remove EXPECTED_VERSION check
* since new SANE standard is forward compatible
*
* Revision 1.72 2008-05-15 12:50:24 ellert-guest
* Fix for bug #306751: sanei-thread with pthreads on 64 bit
*
* Revision 1.71 2008-01-29 17:48:42 kitno-guest

10
backend/sp15c.c
Wyświetl plik

@ -45,7 +45,13 @@ static const char RCSid[] = "$Header$";
/*
* $Log$
* Revision 1.16 2008/07/26 03:53:44 kitno-guest
* Revision 1.17 2008/11/26 21:21:30 kitno-guest
* * backend/*.[ch]: nearly every backend used V_MAJOR
* instead of SANE_CURRENT_MAJOR in sane_init()
* * backend/snapscan.c: remove EXPECTED_VERSION check
* since new SANE standard is forward compatible
*
* Revision 1.16 2008-07-26 03:53:44 kitno-guest
* separate x-resolution from resolution, and update all backends that use
* it, to prevent ui change
*
@ -279,7 +285,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
sanei_thread_init ();
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open (SP15C_CONFIG_FILE);
if (!fp)
{

2
backend/st400.c
Wyświetl plik

@ -683,7 +683,7 @@ sane_init( SANE_Int *versionP, SANE_Auth_Callback authorize )
DBG(DCODE, "sane_init(%p, %p)\n", (void *) versionP, (void *) authorize);
if( versionP != NULL )
*versionP = SANE_VERSION_CODE(V_MAJOR, V_MINOR, 0);
*versionP = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR, 0);
status = SANE_STATUS_GOOD;
if( (fp = sanei_config_open(ST400_CONFIG_FILE)) != NULL ) {

4
backend/stv680.c
Wyświetl plik

@ -1525,13 +1525,13 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
authorize = authorize; /* silence gcc */
DBG (DBG_error, "This is sane-stv680 version %d.%d-%d\n", V_MAJOR,
DBG (DBG_error, "This is sane-stv680 version %d.%d-%d\n", SANE_CURRENT_MAJOR,
V_MINOR, BUILD);
DBG (DBG_error, "(C) 2004-2006 by Gerard Klaver\n");
if (version_code)
{
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
}
DBG (DBG_proc, "sane_init: authorize %s null\n", authorize ? "!=" : "==");

2
backend/tamarack.c
Wyświetl plik

@ -911,7 +911,7 @@ sane_init (SANE_Int *version_code, SANE_Auth_Callback authorize)
sanei_thread_init();
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open (TAMARACK_CONFIG_FILE);
if (!fp) {

4
backend/teco1.c
Wyświetl plik

@ -1478,13 +1478,13 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
DBG (DBG_sane_init, "sane_init\n");
DBG (DBG_error, "This is sane-teco1 version %d.%d-%d\n", V_MAJOR,
DBG (DBG_error, "This is sane-teco1 version %d.%d-%d\n", SANE_CURRENT_MAJOR,
V_MINOR, BUILD);
DBG (DBG_error, "(C) 2002 by Frank Zago\n");
if (version_code)
{
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
}
fp = sanei_config_open (TECO_CONFIG_FILE);

4
backend/teco2.c
Wyświetl plik

@ -2525,13 +2525,13 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
DBG (DBG_sane_init, "sane_init\n");
DBG (DBG_error, "This is sane-teco2 version %d.%d-%d\n", V_MAJOR,
DBG (DBG_error, "This is sane-teco2 version %d.%d-%d\n", SANE_CURRENT_MAJOR,
V_MINOR, BUILD);
DBG (DBG_error, "(C) 2002 - 2003 by Frank Zago, update 2003 - 2008 by Gerard Klaver\n");
if (version_code)
{
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
}
fp = sanei_config_open (TECO2_CONFIG_FILE);

4
backend/teco3.c
Wyświetl plik

@ -1500,13 +1500,13 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
DBG (DBG_sane_init, "sane_init\n");
DBG (DBG_error, "This is sane-teco3 version %d.%d-%d\n", V_MAJOR,
DBG (DBG_error, "This is sane-teco3 version %d.%d-%d\n", SANE_CURRENT_MAJOR,
V_MINOR, BUILD);
DBG (DBG_error, "(C) 2002 by Frank Zago\n");
if (version_code)
{
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
}
fp = sanei_config_open (TECO_CONFIG_FILE);

4
backend/test.c
Wyświetl plik

@ -1462,11 +1462,11 @@ sane_init (SANE_Int * __sane_unused__ version_code, SANE_Auth_Callback __sane_un
test_device = 0;
previous_device = 0;
DBG (1, "sane_init: SANE test backend version %d.%d.%d from %s\n", V_MAJOR,
DBG (1, "sane_init: SANE test backend version %d.%d.%d from %s\n", SANE_CURRENT_MAJOR,
V_MINOR, BUILD, PACKAGE_STRING);
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
if (inited)
DBG (3, "sane_init: warning: already inited\n");

2
backend/u12.c
Wyświetl plik

@ -943,7 +943,7 @@ SANE_Status sane_init( SANE_Int *version_code, SANE_Auth_Callback authorize )
init_config_struct( &config );
if( version_code != NULL )
*version_code = SANE_VERSION_CODE(V_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR, 0);
fp = sanei_config_open( U12_CONFIG_FILE );

4
backend/umax.c
Wyświetl plik

@ -5990,7 +5990,7 @@ SANE_Status sane_init(SANE_Int *version_code, SANE_Auth_Callback authorize)
DBG_INIT();
DBG(DBG_sane_init,"sane_init\n");
DBG(DBG_error,"This is sane-umax version %d.%d build %d\n", V_MAJOR, V_MINOR, BUILD);
DBG(DBG_error,"This is sane-umax version %d.%d build %d\n", SANE_CURRENT_MAJOR, V_MINOR, BUILD);
#ifdef UMAX_ENABLE_USB
DBG(DBG_error,"compiled with USB support for Astra 2200\n");
#else
@ -6001,7 +6001,7 @@ SANE_Status sane_init(SANE_Int *version_code, SANE_Auth_Callback authorize)
if (version_code)
{
*version_code = SANE_VERSION_CODE(V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR, BUILD);
}
frontend_authorize_callback = authorize; /* store frontend authorize callback */

4
backend/umax1220u.c
Wyświetl plik

@ -593,10 +593,10 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
DBG (2, "sane_init: version_code %s 0, authorize %s 0\n",
version_code == 0 ? "=" : "!=", authorize == 0 ? "=" : "!=");
DBG (1, "sane_init: SANE umax1220u backend version %d.%d.%d from %s\n",
V_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
sanei_usb_init ();
sanei_pv8630_init ();

4
backend/umax_pp.c
Wyświetl plik

@ -841,9 +841,9 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
}
if (version_code != NULL)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, UMAX_PP_BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, UMAX_PP_BUILD);
DBG (3, "init: SANE v%s, backend v%d.%d.%d-%s\n", VERSION, V_MAJOR, V_MINOR,
DBG (3, "init: SANE v%s, backend v%d.%d.%d-%s\n", VERSION, SANE_CURRENT_MAJOR, V_MINOR,
UMAX_PP_BUILD, UMAX_PP_STATE);
/* set up configuration options to parse */

2
backend/umax_pp.h
Wyświetl plik

@ -201,7 +201,7 @@ enum Umax_PP_Configure_Option
#endif
#define DEBUG() DBG(4, "%s(v%d.%d.%d-%s): line %d: debug exception\n", \
__PRETTY_FUNCTION__, V_MAJOR, V_MINOR, \
__PRETTY_FUNCTION__, SANE_CURRENT_MAJOR, V_MINOR, \
UMAX_PP_BUILD, UMAX_PP_STATE, __LINE__)
#endif /* umax_pp_h */

4
backend/v4l.c
Wyświetl plik

@ -425,11 +425,11 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
authorize = authorize; /* stop gcc from complaining */
DBG_INIT ();
DBG (2, "SANE v4l backend version %d.%d build %d from %s\n", V_MAJOR,
DBG (2, "SANE v4l backend version %d.%d build %d from %s\n", SANE_CURRENT_MAJOR,
V_MINOR, BUILD, PACKAGE_STRING);
if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
fp = sanei_config_open (V4L_CONFIG_FILE);
if (!fp)