Skip to content

Commit a9415b0

Browse files
committed
fbdev: neofb: Shorten Neomagic product name in info struct
Avoid those compiler warnings: neofb.c:1959:3: warning: 'snprintf' will always be truncated; specified size is 16, but format string expands to at least 17 [-Wfortify-source] Signed-off-by: Helge Deller <[email protected]> Reported-by: Nathan Chancellor <[email protected]> Reported-by: Nick Desaulniers <[email protected]> Reviewed-by: Nick Desaulniers <[email protected]> Link: https://lore.kernel.org/all/CAKwvOdn0xoVWjQ6ufM_rojtKb0f1i1hW-J_xYGfKDNFdHwaeHQ@mail.gmail.com/ Link: ClangBuiltLinux#1923
1 parent bfac19e commit a9415b0

File tree

1 file changed

+9
-18
lines changed

1 file changed

+9
-18
lines changed

drivers/video/fbdev/neofb.c

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1948,49 +1948,40 @@ static struct fb_info *neo_alloc_fb_info(struct pci_dev *dev,
19481948

19491949
switch (info->fix.accel) {
19501950
case FB_ACCEL_NEOMAGIC_NM2070:
1951-
snprintf(info->fix.id, sizeof(info->fix.id),
1952-
"MagicGraph 128");
1951+
strscpy(info->fix.id, "MagicGraph128", sizeof(info->fix.id));
19531952
break;
19541953
case FB_ACCEL_NEOMAGIC_NM2090:
1955-
snprintf(info->fix.id, sizeof(info->fix.id),
1956-
"MagicGraph 128V");
1954+
strscpy(info->fix.id, "MagicGraph128V", sizeof(info->fix.id));
19571955
break;
19581956
case FB_ACCEL_NEOMAGIC_NM2093:
1959-
snprintf(info->fix.id, sizeof(info->fix.id),
1960-
"MagicGraph 128ZV");
1957+
strscpy(info->fix.id, "MagicGraph128ZV", sizeof(info->fix.id));
19611958
break;
19621959
case FB_ACCEL_NEOMAGIC_NM2097:
1963-
snprintf(info->fix.id, sizeof(info->fix.id),
1964-
"MagicGraph 128ZV+");
1960+
strscpy(info->fix.id, "Mag.Graph128ZV+", sizeof(info->fix.id));
19651961
break;
19661962
case FB_ACCEL_NEOMAGIC_NM2160:
1967-
snprintf(info->fix.id, sizeof(info->fix.id),
1968-
"MagicGraph 128XD");
1963+
strscpy(info->fix.id, "MagicGraph128XD", sizeof(info->fix.id));
19691964
break;
19701965
case FB_ACCEL_NEOMAGIC_NM2200:
1971-
snprintf(info->fix.id, sizeof(info->fix.id),
1972-
"MagicGraph 256AV");
1966+
strscpy(info->fix.id, "MagicGraph256AV", sizeof(info->fix.id));
19731967
info->flags |= FBINFO_HWACCEL_IMAGEBLIT |
19741968
FBINFO_HWACCEL_COPYAREA |
19751969
FBINFO_HWACCEL_FILLRECT;
19761970
break;
19771971
case FB_ACCEL_NEOMAGIC_NM2230:
1978-
snprintf(info->fix.id, sizeof(info->fix.id),
1979-
"MagicGraph 256AV+");
1972+
strscpy(info->fix.id, "Mag.Graph256AV+", sizeof(info->fix.id));
19801973
info->flags |= FBINFO_HWACCEL_IMAGEBLIT |
19811974
FBINFO_HWACCEL_COPYAREA |
19821975
FBINFO_HWACCEL_FILLRECT;
19831976
break;
19841977
case FB_ACCEL_NEOMAGIC_NM2360:
1985-
snprintf(info->fix.id, sizeof(info->fix.id),
1986-
"MagicGraph 256ZX");
1978+
strscpy(info->fix.id, "MagicGraph256ZX", sizeof(info->fix.id));
19871979
info->flags |= FBINFO_HWACCEL_IMAGEBLIT |
19881980
FBINFO_HWACCEL_COPYAREA |
19891981
FBINFO_HWACCEL_FILLRECT;
19901982
break;
19911983
case FB_ACCEL_NEOMAGIC_NM2380:
1992-
snprintf(info->fix.id, sizeof(info->fix.id),
1993-
"MagicGraph 256XL+");
1984+
strscpy(info->fix.id, "Mag.Graph256XL+", sizeof(info->fix.id));
19941985
info->flags |= FBINFO_HWACCEL_IMAGEBLIT |
19951986
FBINFO_HWACCEL_COPYAREA |
19961987
FBINFO_HWACCEL_FILLRECT;

0 commit comments

Comments
 (0)