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

.editorconfig: Fix sane-desc tool to match cleaned up references 

Changes to the test reference files should not, famous last words ;-),
have any effect on the use of the tool's actual outputs.

Note that the tests use a "concocted" `testfile.desc` as their input.
merge-requests/1/head
Olaf Meeuwissen 2017-05-30 22:39:30 +09:00
rodzic fc4b250a09
commit 01c5dbc82b
1 zmienionych plików z 20 dodań i 20 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

40
tools/sane-desc.c
Wyświetl plik

@ -315,7 +315,7 @@ print_usage (char *program_name)
printf ("Usage: %s [-s dir] [-m mode] [-d level] [-h] [-V]\n", printf ("Usage: %s [-s dir] [-m mode] [-d level] [-h] [-V]\n",
program_name); program_name);
printf (" -s|--search-dir dir " printf (" -s|--search-dir dir "
"Specify the directory that contains .desc files \n" "Specify the directory that contains .desc files\n"
" " " "
"(multiple directories can be concatenated by \":\")\n"); "(multiple directories can be concatenated by \":\")\n");
printf (" -m|--mode mode " printf (" -m|--mode mode "
@ -2075,7 +2075,7 @@ xml_print_backends (void)
printf ("<backend name=\"*none\">\n"); printf ("<backend name=\"*none\">\n");
if (be->version) if (be->version)
printf ("<version>%s</version> \n", clean_string (be->version)); printf ("<version>%s</version>\n", clean_string (be->version));
else else
printf ("<version>*none*</version>\n"); printf ("<version>*none*</version>\n");
@ -2448,7 +2448,7 @@ html_backends_split_table (device_type dev_type)
backend_entry *be = first_backend; backend_entry *be = first_backend;
SANE_Bool first = SANE_TRUE; SANE_Bool first = SANE_TRUE;
printf ("<p><b>Backends</b>: \n"); printf ("<p><b>Backends</b>:\n");
while (be) /* print link list */ while (be) /* print link list */
{ {
type_entry *type = be->type; type_entry *type = be->type;
@ -2463,7 +2463,7 @@ html_backends_split_table (device_type dev_type)
if (found) if (found)
{ {
if (!first) if (!first)
printf (", \n"); printf (",\n");
first = SANE_FALSE; first = SANE_FALSE;
printf ("<a href=\"#%s\">%s</a>", printf ("<a href=\"#%s\">%s</a>",
html_generate_anchor_name (dev_type, be->name), be->name); html_generate_anchor_name (dev_type, be->name), be->name);
@ -2512,7 +2512,7 @@ html_backends_split_table (device_type dev_type)
if (be->url && be->url->name) if (be->url && be->url->name)
{ {
url_entry *url = be->url; url_entry *url = be->url;
printf ("<b>Link(s):</b> \n"); printf ("<b>Link(s):</b>\n");
while (url) while (url)
{ {
if (url != be->url) if (url != be->url)
@ -2650,11 +2650,11 @@ html_mfgs_table (device_type dev_type)
first_mfg_record = create_mfg_list (dev_type); first_mfg_record = create_mfg_list (dev_type);
mfg_record = first_mfg_record; mfg_record = first_mfg_record;
printf ("<p><b>Manufacturers</b>: \n"); printf ("<p><b>Manufacturers</b>:\n");
while (mfg_record) while (mfg_record)
{ {
if (mfg_record != first_mfg_record) if (mfg_record != first_mfg_record)
printf (", \n"); printf (",\n");
printf ("<a href=\"#%s\">%s</a>", printf ("<a href=\"#%s\">%s</a>",
html_generate_anchor_name (type_unknown, mfg_record->name), html_generate_anchor_name (type_unknown, mfg_record->name),
mfg_record->name); mfg_record->name);
@ -2675,7 +2675,7 @@ html_mfgs_table (device_type dev_type)
if (mfg_record->url && mfg_record->url->name) if (mfg_record->url && mfg_record->url->name)
{ {
url_entry *url = mfg_record->url; url_entry *url = mfg_record->url;
printf ("<b>Link(s):</b> \n"); printf ("<b>Link(s):</b>\n");
while (url) while (url)
{ {
if (url != mfg_record->url) if (url != mfg_record->url)
@ -2798,7 +2798,7 @@ html_print_header (void)
printf printf
("<p>If you have new information or corrections, please file a\n" ("<p>If you have new information or corrections, please file a\n"
"<a href=\"http://www.sane-project.org/bugs.html\">bug report</a>\n" "<a href=\"http://www.sane-project.org/bugs.html\">bug report</a>\n"
"with as many details as possible. Also please tell us if your scanner \n" "with as many details as possible. Also please tell us if your scanner\n"
"isn't mentioned in this list at all.</p>\n" "isn't mentioned in this list at all.</p>\n"
"<p>For an explanation of the tables, see the\n" "<p>For an explanation of the tables, see the\n"
"<a href=\"#legend\">legend</a>.\n"); "<a href=\"#legend\">legend</a>.\n");
@ -2834,8 +2834,8 @@ html_print_legend_backend (void)
" available from their home sites.<br>" " available from their home sites.<br>"
" <font color=" COLOR_NEW ">NEW!</font> means brand-new to the\n" " <font color=" COLOR_NEW ">NEW!</font> means brand-new to the\n"
" current release of SANE.<br>\n" " current release of SANE.<br>\n"
" UNMAINTAINED means that nobody maintains that backend. Expect no \n" " UNMAINTAINED means that nobody maintains that backend. Expect no\n"
" new features or newly supported devices. You are welcome to take over \n" " new features or newly supported devices. You are welcome to take over\n"
" maintainership.\n" " </dd>\n"); " maintainership.\n" " </dd>\n");
} }
@ -2902,7 +2902,7 @@ html_print_legend_status (void)
{ {
printf printf
(" <dt><b>Status</b>:</dt>\n" (" <dt><b>Status</b>:</dt>\n"
" <dd>Indicates how many of the features the device provides \n" " <dd>Indicates how many of the features the device provides\n"
" are supported by SANE.\n" " are supported by SANE.\n"
" <ul><li><font color=" COLOR_UNSUPPORTED ">unsupported</font>" " <ul><li><font color=" COLOR_UNSUPPORTED ">unsupported</font>"
" means the device is not supported at least by this backend. " " means the device is not supported at least by this backend. "
@ -2912,16 +2912,16 @@ html_print_legend_status (void)
" device may be supported but couldn't be tested. Be very " " device may be supported but couldn't be tested. Be very "
" careful and report success/failure.\n" " careful and report success/failure.\n"
" <li><font color=" COLOR_MINIMAL ">minimal</font> means that the\n" " <li><font color=" COLOR_MINIMAL ">minimal</font> means that the\n"
" device is detected and scans at least in one mode. But the quality \n" " device is detected and scans at least in one mode. But the quality\n"
" is bad or important features won't work.\n"); " is bad or important features won't work.\n");
printf printf
(" <li><font color=" COLOR_BASIC ">basic</font> means it works at \n" (" <li><font color=" COLOR_BASIC ">basic</font> means it works at\n"
" least in the most important modes but quality is not perfect.\n" " least in the most important modes but quality is not perfect.\n"
" <li><font color=" COLOR_GOOD " <li><font color=" COLOR_GOOD
">good</font> means the device is usable \n" ">good</font> means the device is usable\n"
" for day-to-day work. Some rather exotic features may be missing.\n" " for day-to-day work. Some rather exotic features may be missing.\n"
" <li><font color=" COLOR_COMPLETE " <li><font color=" COLOR_COMPLETE
">complete</font> means the backends \n" ">complete</font> means the backends\n"
" supports everything the device can do.\n" " </ul></dd>\n"); " supports everything the device can do.\n" " </ul></dd>\n");
} }
@ -3451,7 +3451,7 @@ print_db (void)
name = name->next; name = name->next;
} }
printf ("\n"); printf ("\n");
printf ("%s\t%s\t%s:%s\t%s\t\n", usbid->usb_vendor_id, printf ("%s\t%s\t%s:%s\t%s\n", usbid->usb_vendor_id,
usbid->usb_product_id, DEVOWNER, DEVGROUP, DEVMODE); usbid->usb_product_id, DEVOWNER, DEVGROUP, DEVMODE);
usbid = usbid->next; usbid = usbid->next;
} }
@ -3783,7 +3783,7 @@ print_hwdb_header (void)
"#\n" "#\n"
"# If the scanner is supported by sane-backends, please mail the entry to\n" "# If the scanner is supported by sane-backends, please mail the entry to\n"
"# the sane-devel mailing list (sane-devel@lists.alioth.debian.org).\n" "# the sane-devel mailing list (sane-devel@lists.alioth.debian.org).\n"
"#\n" "#"
); );
} }
@ -3802,7 +3802,7 @@ print_hwdb (void)
manufacturer_model_type * name = usbid->name; manufacturer_model_type * name = usbid->name;
i = 0; i = 0;
printf ("# "); printf ("\n# ");
while (name) while (name)
{ {
if ((name != usbid->name) && (i > 0)) if ((name != usbid->name) && (i > 0))
@ -3833,7 +3833,7 @@ print_hwdb (void)
product_id[j] = toupper(product_id[j]); product_id[j] = toupper(product_id[j]);
} }
printf ("usb:v%sp%s*\n libsane_matched=yes\n\n", printf ("usb:v%sp%s*\n libsane_matched=yes\n",
vendor_id, product_id); vendor_id, product_id);
free(vendor_id); free(vendor_id);