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

pixma: replace snprintf() by strftime() 

strftime() uses format specifiers with fixed lengths.
merge-requests/212/merge
Rolf Bensch 2019-10-12 17:59:13 +02:00
rodzic 6959c2d14e
commit ba9bc24fd2
3 zmienionych plików z 3 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
backend/pixma_mp150.c
Wyświetl plik

@ -917,10 +917,7 @@ send_time (pixma_t * s)
data = pixma_newcmd (&mp->cb, cmd_time, 20, 0); data = pixma_newcmd (&mp->cb, cmd_time, 20, 0);
pixma_get_time (&now, NULL); pixma_get_time (&now, NULL);
t = localtime (&now); t = localtime (&now);
snprintf ((char *) data, 16, strftime ((char *) data, 16, "%y/%m/%d %H:%M", t);
"%02d/%02d/%02d %02d:%02d",
t->tm_year % 100, t->tm_mon + 1, t->tm_mday,
t->tm_hour, t->tm_min);
PDBG (pixma_dbg (3, "Sending time: '%s'\n", (char *) data)); PDBG (pixma_dbg (3, "Sending time: '%s'\n", (char *) data));
return pixma_exec (s, &mp->cb); return pixma_exec (s, &mp->cb);
} }

5
backend/pixma_mp730.c
Wyświetl plik

@ -298,10 +298,7 @@ send_time (pixma_t * s)
data = pixma_newcmd (&mp->cb, cmd_time, 20, 0); data = pixma_newcmd (&mp->cb, cmd_time, 20, 0);
pixma_get_time (&now, NULL); pixma_get_time (&now, NULL);
t = localtime (&now); t = localtime (&now);
snprintf ((char *) data, 16, strftime ((char *) data, 16, "%y/%m/%d %H:%M", t);
"%02d/%02d/%02d %02d:%02d",
t->tm_year % 100, t->tm_mon + 1, t->tm_mday,
t->tm_hour, t->tm_min);
PDBG (pixma_dbg (3, "Sending time: '%s'\n", (char *) data)); PDBG (pixma_dbg (3, "Sending time: '%s'\n", (char *) data));
return pixma_exec (s, &mp->cb); return pixma_exec (s, &mp->cb);
} }

3
backend/pixma_mp810.c
Wyświetl plik

@ -1021,8 +1021,7 @@ static int send_time (pixma_t * s)
data = pixma_newcmd (&mp->cb, cmd_time, 20, 0); data = pixma_newcmd (&mp->cb, cmd_time, 20, 0);
pixma_get_time (&now, NULL); pixma_get_time (&now, NULL);
t = localtime (&now); t = localtime (&now);
snprintf ((char *) data, 16, "%02d/%02d/%02d %02d:%02d", t->tm_year % 100, strftime ((char *) data, 16, "%y/%m/%d %H:%M", t);
t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min);
PDBG(pixma_dbg (3, "Sending time: '%s'\n", (char *) data)); PDBG(pixma_dbg (3, "Sending time: '%s'\n", (char *) data));
return pixma_exec (s, &mp->cb); return pixma_exec (s, &mp->cb);
} }