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

treewide: use SANE_CURRENT_* macros consistently 

Backends use a mixture of SANE_CURRENT_{MAJOR | MINOR} and V_{MAJOR |
MINOR} with all kind of permutations. I was confused by this and one
comment in pieusb.c tells me I was not alone. Some items in old
changelogs suggest to use the SANE_CURRENT_ macros in backends, so let's
switch to do that with the exception of net.c and dll.c. Done with:

$ find backend -name '*.[ch]' | xargs sed -i '/nearly every/ ! { s/\<V_M/SANE_CURRENT_M/g }'
$ git checkout backend/net.c backend/dll.c

And manually removing the comment from pieusb.c. Everything still builds
fine.
merge-requests/632/head
Wolfram Sang 2021-06-08 17:13:51 +02:00
rodzic a78abbbdba
commit eb42ad08d5
91 zmienionych plików z 128 dodań i 129 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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 (SANE_CURRENT_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_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 (SANE_CURRENT_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_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 (SANE_CURRENT_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 0);
fp = sanei_config_open (APPLE_CONFIG_FILE);
if (!fp)

2
backend/artec.c
Wyświetl plik

@ -2591,7 +2591,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
strcpy (artec_model, "");
if (version_code)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 0);
if (authorize)
DBG (7, "sane_init(), authorize %s null\n", (authorize) ? "!=" : "==");

2
backend/artec_eplus48u.c
Wyświetl plik

@ -4458,7 +4458,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
auth = authorize;
if (version_code != NULL)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_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 %s null)\n", (authorize) ? "!=" : "==");
if (version_code)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 0);
/* fp = sanei_config_open (AS6E_CONFIG_FILE);*/
if (!fp)
{

4
backend/avision.c
Wyświetl plik

@ -8451,13 +8451,13 @@ sane_init (SANE_Int* version_code, SANE_Auth_Callback authorize)
#endif
DBG (3, "sane_init:(Version: %i.%i Build: %i)\n",
SANE_CURRENT_MAJOR, V_MINOR, BACKEND_BUILD);
SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BACKEND_BUILD);
/* must come first */
sanei_thread_init ();
if (version_code)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BACKEND_BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BACKEND_BUILD);
sane_reload_devices ();

4
backend/bh.c
Wyświetl plik

@ -3150,11 +3150,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",
SANE_CURRENT_MAJOR, V_MINOR, BUILD,
SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD,
_is_host_little_endian() ? "little" : "big");
if (version_code)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_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 __sane_unused__ authorize
#endif
if (version_code)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 0);
fp = sanei_config_open (CANON_CONFIG_FILE);
if (fp)

4
backend/canon630u.c
Wyświetl plik

@ -720,10 +720,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",
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD, PACKAGE_STRING);
if (version_code)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
sanei_usb_init ();

4
backend/canon_dr.c
Wyświetl plik

@ -500,10 +500,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 (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
DBG (5, "sane_init: canon_dr backend %d.%d.%d, from %s\n",
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD, PACKAGE_STRING);
DBG (10, "sane_init: finish\n");

4
backend/canon_lide70.c
Wyświetl plik

@ -225,10 +225,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 Canon LiDE70 backend version %d.%d.%d from %s\n",
V_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, SANE_CURRENT_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, SANE_CURRENT_MINOR, BUILD);
sanei_usb_init ();

2
backend/canon_pp.c
Wyświetl plik

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

4
backend/cardscan.c
Wyświetl plik

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

2
backend/coolscan.c
Wyświetl plik

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

2
backend/coolscan2.c
Wyświetl plik

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

2
backend/coolscan3.c
Wyświetl plik

@ -317,7 +317,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(SANE_CURRENT_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 0);
sanei_usb_init();

2
backend/dc210.c
Wyświetl plik

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

2
backend/dc240.c
Wyświetl plik

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

2
backend/dc25.c
Wyświetl plik

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

2
backend/dell1600n_net.c
Wyświetl plik

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

2
backend/dmc.c
Wyświetl plik

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

4
backend/epjitsu.c
Wyświetl plik

@ -271,10 +271,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 (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
DBG (5, "sane_init: epjitsu backend %d.%d.%d, from %s\n",
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD, PACKAGE_STRING);
DBG (10, "sane_init: finish\n");

2
backend/epson.c
Wyświetl plik

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

2
backend/epson2.c
Wyświetl plik

@ -900,7 +900,7 @@ sane_init(SANE_Int *version_code, SANE_Auth_Callback __sane_unused__ authorize)
/* Keep '124' as our build version. The arg is obsolete by now */
if (version_code)
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR, 124);
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 124);
sanei_usb_init();
sanei_usb_set_timeout(60 * 1000);

2
backend/epsonds.c
Wyświetl plik

@ -570,7 +570,7 @@ sane_init(SANE_Int *version_code, SANE_Auth_Callback __sane_unused__ authorize)
EPSONDS_VERSION, EPSONDS_REVISION, EPSONDS_BUILD);
if (version_code != NULL)
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR,
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR,
EPSONDS_BUILD);
sanei_usb_init();

4
backend/fujitsu.c
Wyświetl plik

@ -770,10 +770,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 (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
DBG (5, "sane_init: fujitsu backend %d.%d.%d, from %s\n",
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD, PACKAGE_STRING);
sanei_magic_init();

2
backend/gphoto2.c
Wyświetl plik

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

4
backend/gt68xx.c
Wyświetl plik

@ -1332,10 +1332,10 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
}
#endif
DBG (2, "SANE GT68xx backend version %d.%d build %d from %s\n", SANE_CURRENT_MAJOR,
V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MINOR, BUILD, PACKAGE_STRING);
if (version_code)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
DBG (5, "sane_init: authorize %s null\n", authorize ? "!=" : "==");

2
backend/hp.c
Wyświetl plik

@ -816,7 +816,7 @@ sane_init (SANE_Int *version_code, SANE_Auth_Callback __sane_unused__ authorize)
hp_destroy();
if (version_code)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, VERSIO);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, VERSIO);
status = hp_init();
DBG(3, "sane_init will finish with %s\n", sane_strstatus (status));

2
backend/hp3500.c
Wyświetl plik

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

2
backend/hp3900_sane.c
Wyświetl plik

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

4
backend/hp4200.c
Wyświetl plik

@ -2375,12 +2375,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",
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD, PACKAGE_STRING);
/* put some version_code checks here */
if (NULL != version_code)
{
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 0);
}
sanei_usb_init ();

4
backend/hp5400_sane.c
Wyświetl plik

@ -623,7 +623,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",
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD, PACKAGE_STRING);
sanei_usb_init ();
@ -671,7 +671,7 @@ sane_init (SANE_Int * piVersion, SANE_Auth_Callback pfnAuth)
if (piVersion != NULL)
{
*piVersion = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*piVersion = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
}
return SANE_STATUS_GOOD;

4
backend/hp5590.c
Wyświetl plik

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

2
backend/hpljm1005.c
Wyświetl plik

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

4
backend/hpsj5s.c
Wyświetl plik

@ -166,11 +166,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",
SANE_CURRENT_MAJOR, V_MINOR, BUILD);
SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
/*Inform about supported version */
if (version_code)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
/*Open configuration file for this backend */
config_file = sanei_config_open (HPSJ5S_CONFIG_FILE);

4
backend/hs2p.c
Wyświetl plik

@ -1565,14 +1565,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", SANE_CURRENT_MAJOR, V_MINOR, BUILD);
PACKAGE " " VERSION ")\n", SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
#endif
/*
sanei_thread_init ();
*/
if (version_code)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 0);
if ((fp = sanei_config_open (HS2P_CONFIG_FILE)) != NULL)

4
backend/ibm.c
Wyświetl plik

@ -545,11 +545,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", SANE_CURRENT_MAJOR, V_MINOR, BUILD);
PACKAGE " " VERSION ")\n", SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
#endif
if (version_code)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 0);
fp = sanei_config_open(IBM_CONFIG_FILE);
if (fp)

4
backend/kodak.c
Wyświetl plik

@ -181,10 +181,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, SANE_CURRENT_MINOR, BUILD);
DBG (5, "sane_init: kodak backend %d.%d.%d, from %s\n",
V_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD, PACKAGE_STRING);
DBG (10, "sane_init: finish\n");

2
backend/kodakaio.c
Wyświetl plik

@ -2629,7 +2629,7 @@ sane_init(SANE_Int *version_code, SANE_Auth_Callback __sane_unused__ authorize)
KODAKAIO_VERSION, KODAKAIO_REVISION, KODAKAIO_BUILD);
DBG(2, "%s: called\n", __func__);
if (version_code != NULL)
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR,
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR,
KODAKAIO_BUILD);
sanei_usb_init();

4
backend/kvs1025.c
Wyświetl plik

@ -51,11 +51,11 @@ sane_init (SANE_Int * version_code,
DBG (DBG_error,
"This is panasonic KV-S1020C / KV-S1025C version %d.%d build %d\n",
V_MAJOR, V_MINOR, V_BUILD);
SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, V_BUILD);
if (version_code)
{
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, V_BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, V_BUILD);
}
/* Initialize USB */

2
backend/kvs20xx.c
Wyświetl plik

@ -64,7 +64,7 @@ sane_init (SANE_Int __sane_unused__ * version_code,
DBG_INIT ();
DBG (DBG_INFO, "This is panasonic kvs20xx driver\n");
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
/* Initialize USB */
sanei_usb_init ();

2
backend/kvs40xx.c
Wyświetl plik

@ -165,7 +165,7 @@ sane_init (SANE_Int __sane_unused__ * version_code,
DBG_INIT ();
DBG (DBG_INFO, "This is panasonic kvs40xx driver\n");
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 1);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 1);
/* Initialize USB */
sanei_usb_init ();

4
backend/leo.c
Wyświetl plik

@ -1298,12 +1298,12 @@ 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", SANE_CURRENT_MAJOR,
V_MINOR, BUILD);
SANE_CURRENT_MINOR, BUILD);
DBG (DBG_error, "(C) 2002 by Frank Zago\n");
if (version_code)
{
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
}
fp = sanei_config_open (LEO_CONFIG_FILE);

4
backend/lexmark.c
Wyświetl plik

@ -526,12 +526,12 @@ sane_init (SANE_Int * version_code,
DBG_INIT ();
DBG (1, "SANE Lexmark backend version %d.%d.%d-devel\n", SANE_CURRENT_MAJOR,
V_MINOR, BUILD);
SANE_CURRENT_MINOR, BUILD);
DBG (2, "sane_init: version_code=%p\n", (void *) version_code);
if (version_code)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
#ifndef FAKE_USB
sanei_usb_init ();

4
backend/ma1509.c
Wyświetl plik

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

2
backend/magicolor.c
Wyświetl plik

@ -2266,7 +2266,7 @@ sane_init(SANE_Int *version_code, SANE_Auth_Callback __sane_unused__ authorize)
MAGICOLOR_VERSION, MAGICOLOR_REVISION, MAGICOLOR_BUILD);
if (version_code != NULL)
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR,
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR,
MAGICOLOR_BUILD);
sanei_usb_init();

4
backend/matsushita.c
Wyświetl plik

@ -1711,12 +1711,12 @@ 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", SANE_CURRENT_MAJOR,
V_MINOR, BUILD);
SANE_CURRENT_MINOR, BUILD);
DBG (DBG_error, "(C) 2002 by Frank Zago\n");
if (version_code)
{
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
}
fp = sanei_config_open (MATSUSHITA_CONFIG_FILE);

2
backend/microtek.c
Wyświetl plik

@ -3065,7 +3065,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 (SANE_CURRENT_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 0);
/* parse config file */
fp = sanei_config_open (MICROTEK_CONFIG_FILE);

2
backend/microtek2.c
Wyświetl plik

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

4
backend/mustek.c
Wyświetl plik

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

2
backend/mustek_pp.c
Wyświetl plik

@ -710,7 +710,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 (SANE_CURRENT_MAJOR, V_MINOR, MUSTEK_PP_BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, MUSTEK_PP_BUILD);
sane_auth = authorize;

4
backend/mustek_usb.c
Wyświetl plik

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

4
backend/mustek_usb2.c
Wyświetl plik

@ -2008,12 +2008,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",
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD, PACKAGE_STRING);
num_devices = 1; /* HOLD: only one device in this backend */
if (version_code != NULL)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
DBG (DBG_INFO, "sane_init: authorize %s null\n", authorize ? "!=" : "==");

2
backend/nec.c
Wyświetl plik

@ -1898,7 +1898,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 (SANE_CURRENT_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 0);
fp = sanei_config_open (NEC_CONFIG_FILE);
if (!fp)

2
backend/niash.c
Wyświetl plik

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

4
backend/p5.c
Wyświetl plik

@ -164,12 +164,12 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
/* init backend debug */
DBG_INIT ();
DBG (DBG_info, "SANE P5 backend version %d.%d-%d\n",
SANE_CURRENT_MAJOR, V_MINOR, BUILD);
SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
DBG (DBG_proc, "sane_init: start\n");
DBG (DBG_trace, "sane_init: init_count=%d\n", init_count);
if (version_code)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
/* cold-plugging case : probe for already plugged devices */
status = probe_p5_devices ();

2
backend/pie.c
Wyświetl plik

@ -2936,7 +2936,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 (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
fp = sanei_config_open (PIE_CONFIG_FILE);
if (!fp)

1
backend/pieusb.c
Wyświetl plik

@ -165,7 +165,6 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
DBG (DBG_info_sane, "sane_init() build %d\n", BUILD);
/* Set version code to current major, minor and build number */
/* TODO: use V_MINOR instead or SANE_CURRENT_MINOR? If so, why? */
if (version_code)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);

2
backend/pint.c
Wyświetl plik

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

2
backend/pixma/pixma.c
Wyświetl plik

@ -1661,7 +1661,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 (SANE_CURRENT_MAJOR, V_MINOR, myversion);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, myversion);
DBG_INIT ();
sanei_thread_init ();
pixma_set_debug_level (DBG_LEVEL);

2
backend/plustek.c
Wyświetl plik

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

2
backend/plustek_pp.c
Wyświetl plik

@ -1166,7 +1166,7 @@ SANE_Status sane_init( SANE_Int *version_code, SANE_Auth_Callback authorize )
#endif
if( version_code != NULL )
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, SANE_CURRENT_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",
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD, PACKAGE_STRING);
if (version_code)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
return SANE_STATUS_GOOD;
}

2
backend/qcam.c
Wyświetl plik

@ -1461,7 +1461,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 (SANE_CURRENT_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 0);
fp = sanei_config_open (QCAM_CONFIG_FILE);
if (!fp)

2
backend/ricoh.c
Wyświetl plik

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

2
backend/ricoh2.c
Wyświetl plik

@ -293,7 +293,7 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback __sane_unused__ cb)
}
if (vc)
*vc = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
*vc = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 0);
DBG(8, "<sane_init\n");
initialized = SANE_TRUE;

4
backend/rts8891.c
Wyświetl plik

@ -315,11 +315,11 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
/* init backend debug */
DBG_INIT ();
DBG (DBG_info, "SANE Rts8891 backend version %d.%d-%d\n",
SANE_CURRENT_MAJOR, V_MINOR, BUILD);
SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
DBG (DBG_proc, "sane_init: start\n");
if (version_code)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
/* cold-plugging case : probe for already plugged devices */
status = probe_rts8891_devices ();

2
backend/rts8891_low.c
Wyświetl plik

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

2
backend/rts88xx_lib.c
Wyświetl plik

@ -63,7 +63,7 @@ void
sanei_rts88xx_lib_init (void)
{
DBG_INIT ();
DBG (DBG_info, "RTS88XX library, version %d.%d-%d\n", SANE_CURRENT_MAJOR, V_MINOR,
DBG (DBG_info, "RTS88XX library, version %d.%d-%d\n", SANE_CURRENT_MAJOR, SANE_CURRENT_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 (SANE_CURRENT_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 0);
fp = sanei_config_open ("s9036.conf");
if (!fp)

4
backend/sceptre.c
Wyświetl plik

@ -1315,12 +1315,12 @@ 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", SANE_CURRENT_MAJOR,
V_MINOR, BUILD);
SANE_CURRENT_MINOR, BUILD);
DBG (DBG_error, "(C) 2002 by Frank Zago\n");
if (version_code)
{
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
}
fp = sanei_config_open (SCEPTRE_CONFIG_FILE);

2
backend/sharp.c
Wyświetl plik

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

4
backend/sm3600.c
Wyświetl plik

@ -390,9 +390,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 (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
DBG(DEBUG_VERBOSE,"SM3600 version: %x\n",
SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR, BUILD));
SANE_VERSION_CODE(SANE_CURRENT_MAJOR, SANE_CURRENT_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 (SANE_CURRENT_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 0);
if (authorize)
DBG (2, "Unused authorize\n");

2
backend/sp15c.c
Wyświetl plik

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

2
backend/st400.c
Wyświetl plik

@ -680,7 +680,7 @@ sane_init( SANE_Int *versionP, SANE_Auth_Callback authorize )
DBG(DCODE, "sane_init: version %s null, authorize %s null\n", (versionP) ? "!=" : "==", (authorize) ? "!=" : "==");
if( versionP != NULL )
*versionP = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR, 0);
*versionP = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 0);
status = SANE_STATUS_GOOD;
if( (fp = sanei_config_open(ST400_CONFIG_FILE)) != NULL ) {

4
backend/stv680.c
Wyświetl plik

@ -1523,12 +1523,12 @@ 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", SANE_CURRENT_MAJOR,
V_MINOR, BUILD);
SANE_CURRENT_MINOR, BUILD);
DBG (DBG_error, "(C) 2004-2006 by Gerard Klaver\n");
if (version_code)
{
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
}
DBG (DBG_proc, "sane_init: authorize %s null\n", authorize ? "!=" : "==");

2
backend/tamarack.c
Wyświetl plik

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

4
backend/teco1.c
Wyświetl plik

@ -1476,12 +1476,12 @@ 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", SANE_CURRENT_MAJOR,
V_MINOR, BUILD);
SANE_CURRENT_MINOR, BUILD);
DBG (DBG_error, "(C) 2002 by Frank Zago\n");
if (version_code)
{
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
}
fp = sanei_config_open (TECO_CONFIG_FILE);

4
backend/teco2.c
Wyświetl plik

@ -2519,12 +2519,12 @@ 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", SANE_CURRENT_MAJOR,
V_MINOR, BUILD);
SANE_CURRENT_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 (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
}
fp = sanei_config_open (TECO2_CONFIG_FILE);

4
backend/teco3.c
Wyświetl plik

@ -1498,12 +1498,12 @@ 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", SANE_CURRENT_MAJOR,
V_MINOR, BUILD);
SANE_CURRENT_MINOR, BUILD);
DBG (DBG_error, "(C) 2002 by Frank Zago\n");
if (version_code)
{
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
}
fp = sanei_config_open (TECO_CONFIG_FILE);

4
backend/test.c
Wyświetl plik

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

2
backend/u12.c
Wyświetl plik

@ -941,7 +941,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(SANE_CURRENT_MAJOR, V_MINOR, 0);
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 0);
fp = sanei_config_open( U12_CONFIG_FILE );

4
backend/umax.c
Wyświetl plik

@ -5987,7 +5987,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", SANE_CURRENT_MAJOR, V_MINOR, BUILD);
DBG(DBG_error,"This is sane-umax version %d.%d build %d\n", SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
#ifdef UMAX_ENABLE_USB
DBG(DBG_error,"compiled with USB support for Astra 2200\n");
#else
@ -5998,7 +5998,7 @@ SANE_Status sane_init(SANE_Int *version_code, SANE_Auth_Callback authorize)
if (version_code)
{
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, SANE_CURRENT_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",
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD, PACKAGE_STRING);
if (version_code)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BUILD);
sanei_usb_init ();
sanei_pv8630_init ();

4
backend/umax_pp.c
Wyświetl plik

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

2
backend/umax_pp.h
Wyświetl plik

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

4
backend/v4l.c
Wyświetl plik

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

2
backend/xerox_mfp.c
Wyświetl plik

@ -1042,7 +1042,7 @@ sane_init(SANE_Int *version_code, SANE_Auth_Callback cb)
(version_code) ? "!=" : "==", (cb) ? "!=" : "==");
if (version_code)
*version_code = SANE_VERSION_CODE(V_MAJOR, V_MINOR, BACKEND_BUILD);
*version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, BACKEND_BUILD);
sanei_usb_init();
return SANE_STATUS_GOOD;