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 'ibm-backend-produces-compiler-warnings-in-debian-10' into 'master' 

Resolve "IBM & Ricoh backends produces compiler warnings in Debian 10"

Closes #190

See merge request sane-project/backends!264
merge-requests/213/head
Olaf Meeuwissen 2019-12-24 08:59:27 +00:00
rodzic 92308130f4 821efb2626
commit f506aceb33
2 zmienionych plików z 12 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
backend/ibm.c
Wyświetl plik

@ -248,12 +248,14 @@ attach (const char *devnam, Ibm_Device ** devp)
dev->sane.name = strdup (devnam);
dev->sane.vendor = "IBM";
str = malloc (sizeof(ibuf.product) + sizeof(ibuf.revision) + 1);
size_t prod_rev_size = sizeof(ibuf.product) + sizeof(ibuf.revision) + 1;
str = malloc (prod_rev_size);
if (str)
{
str[0] = '\0';
strncat (str, (char *)ibuf.product, sizeof(ibuf.product));
strncat (str, (char *)ibuf.revision, sizeof(ibuf.revision));
snprintf (str, prod_rev_size, "%.*s%.*s",
(int) sizeof(ibuf.product), (const char *) ibuf.product,
(int) sizeof(ibuf.revision), (const char *) ibuf.revision);
}
dev->sane.model = str;
dev->sane.type = "flatbed scanner";

10
backend/ricoh.c
Wyświetl plik

@ -222,12 +222,14 @@ attach (const char *devnam, Ricoh_Device ** devp)
dev->sane.name = strdup (devnam);
dev->sane.vendor = "RICOH";
str = malloc (sizeof(ibuf.product) + sizeof(ibuf.revision) + 1);
size_t prod_rev_size = sizeof(ibuf.product) + sizeof(ibuf.revision) + 1;
str = malloc (prod_rev_size);
if (str)
{
str[0] = '\0';
strncat (str, (char *)ibuf.product, sizeof(ibuf.product));
strncat (str, (char *)ibuf.revision, sizeof(ibuf.revision));
snprintf (str, prod_rev_size, "%.*s%.*s",
(int) sizeof(ibuf.product), (const char *) ibuf.product,
(int) sizeof(ibuf.revision), (const char *) ibuf.revision);
}
dev->sane.model = str;
dev->sane.type = "flatbed scanner";