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

Merge branch '198-fix-compiler-warning-in-scanimage-frontend' into 'master' 

Resolve "Fix compiler warning in scanimage frontend"

Closes #198

See merge request sane-project/backends!286
merge-requests/213/head
Ralph Little 2019-12-29 19:08:01 +00:00
rodzic 6f34396ab4 7f97712491
commit a9ab9df997
1 zmienionych plików z 18 dodań i 39 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

57
frontend/scanimage.c
Wyświetl plik

@ -205,51 +205,30 @@ auth_callback (SANE_String_Const resource,
if ((strlen (tmp) > 0) && (tmp[strlen (tmp) - 1] == '\r')) if ((strlen (tmp) > 0) && (tmp[strlen (tmp) - 1] == '\r'))
tmp[strlen (tmp) - 1] = 0; tmp[strlen (tmp) - 1] = 0;
if (strchr (tmp, ':') != NULL) char *colon1 = strchr (tmp, ':');
if (colon1 != NULL)
{ {
char *tmp_username = tmp;
*colon1 = '\0';
if (strchr (strchr (tmp, ':') + 1, ':') != NULL) char *colon2 = strchr (colon1 + 1, ':');
if (colon2 != NULL)
{ {
char *tmp_password = colon1 + 1;
*colon2 = '\0';
if ((strncmp if ((strncmp (colon2 + 1, resource, len) == 0)
(strchr (strchr (tmp, ':') + 1, ':') + 1, && ((int) strlen (colon2 + 1) == len))
resource, len) == 0)
&&
((int) strlen
(strchr (strchr (tmp, ':') + 1, ':') + 1) ==
len))
{ {
if ((strlen (tmp_username) < SANE_MAX_USERNAME_LEN) &&
(strlen (tmp_password) < SANE_MAX_PASSWORD_LEN))
{
strncpy (username, tmp_username, SANE_MAX_USERNAME_LEN);
strncpy (password, tmp_password, SANE_MAX_PASSWORD_LEN);
if ((strchr (tmp, ':') - tmp) < query_user = 0;
SANE_MAX_USERNAME_LEN) break;
{ }
if ((strchr (strchr (tmp, ':') + 1, ':') -
(strchr (tmp, ':') + 1)) <
SANE_MAX_PASSWORD_LEN)
{
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;
query_user = 0;
break;
}
}
} }
} }
} }