scanimage: Un-word-wrap auth_callback to improve readability

This is one of those cases where word-wrapping to less than 80 or so
characters isn't helpful in understanding the code.
merge-requests/213/head
Olaf Meeuwissen 2019-12-28 18:03:00 +09:00
rodzic bac0c4abce
commit 5e6a111ffa
1 zmienionych plików z 7 dodań i 25 usunięć

Wyświetl plik

@ -211,39 +211,21 @@ auth_callback (SANE_String_Const resource,
if (strchr (strchr (tmp, ':') + 1, ':') != NULL)
{
if ((strncmp
(strchr (strchr (tmp, ':') + 1, ':') + 1,
resource, len) == 0)
&&
((int) strlen
(strchr (strchr (tmp, ':') + 1, ':') + 1) ==
len))
if ((strncmp (strchr (strchr (tmp, ':') + 1, ':') + 1, resource, len) == 0)
&& ((int) strlen (strchr (strchr (tmp, ':') + 1, ':') + 1) == len))
{
if ((strchr (tmp, ':') - tmp) <
SANE_MAX_USERNAME_LEN)
if ((strchr (tmp, ':') - tmp) < SANE_MAX_USERNAME_LEN)
{
if ((strchr (strchr (tmp, ':') + 1, ':') -
(strchr (tmp, ':') + 1)) <
SANE_MAX_PASSWORD_LEN)
if ((strchr (strchr (tmp, ':') + 1, ':') - (strchr (tmp, ':') + 1)) < SANE_MAX_PASSWORD_LEN)
{
strncpy (username, tmp,
strchr (tmp, ':') - tmp);
strncpy (username, tmp, strchr (tmp, ':') - tmp);
username[strchr (tmp, ':') - tmp] = 0;
strncpy (password,
strchr (tmp, ':') + 1,
strchr (strchr (tmp, ':') + 1,
':') -
(strchr (tmp, ':') + 1));
password[strchr
(strchr (tmp, ':') + 1,
':') - (strchr (tmp,
':') + 1)] =
0;
strncpy (password, strchr (tmp, ':') + 1, strchr (strchr (tmp, ':') + 1, ':') - (strchr (tmp, ':') + 1));
password[strchr (strchr (tmp, ':') + 1, ':') - (strchr (tmp, ':') + 1)] = 0;
query_user = 0;
break;