Commit a9415b03 authored by Helge Deller's avatar Helge Deller
Browse files

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: default avatarHelge Deller <deller@gmx.de>
Reported-by: default avatarNathan Chancellor <nathan@kernel.org>
Reported-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Link: https://lore.kernel.org/all/CAKwvOdn0xoVWjQ6ufM_rojtKb0f1i1hW-J_xYGfKDNFdHwaeHQ@mail.gmail.com/
Link: https://github.com/ClangBuiltLinux/linux/issues/1923
parent bfac19e2

drivers/video/fbdev/neofb.c

+9 −18
Original line number Diff line number Diff line
@@ -1948,49 +1948,40 @@ static struct fb_info *neo_alloc_fb_info(struct pci_dev *dev, 


	switch (info->fix.accel) {

	case FB_ACCEL_NEOMAGIC_NM2070:

		snprintf(info->fix.id, sizeof(info->fix.id),

				"MagicGraph 128");

		strscpy(info->fix.id, "MagicGraph128", sizeof(info->fix.id));

		break;

	case FB_ACCEL_NEOMAGIC_NM2090:

		snprintf(info->fix.id, sizeof(info->fix.id),

				"MagicGraph 128V");

		strscpy(info->fix.id, "MagicGraph128V", sizeof(info->fix.id));

		break;

	case FB_ACCEL_NEOMAGIC_NM2093:

		snprintf(info->fix.id, sizeof(info->fix.id),

				"MagicGraph 128ZV");

		strscpy(info->fix.id, "MagicGraph128ZV", sizeof(info->fix.id));

		break;

	case FB_ACCEL_NEOMAGIC_NM2097:

		snprintf(info->fix.id, sizeof(info->fix.id),

				"MagicGraph 128ZV+");

		strscpy(info->fix.id, "Mag.Graph128ZV+", sizeof(info->fix.id));

		break;

	case FB_ACCEL_NEOMAGIC_NM2160:

		snprintf(info->fix.id, sizeof(info->fix.id),

				"MagicGraph 128XD");

		strscpy(info->fix.id, "MagicGraph128XD", sizeof(info->fix.id));

		break;

	case FB_ACCEL_NEOMAGIC_NM2200:

		snprintf(info->fix.id, sizeof(info->fix.id),

				"MagicGraph 256AV");

		strscpy(info->fix.id, "MagicGraph256AV", sizeof(info->fix.id));

		info->flags |= FBINFO_HWACCEL_IMAGEBLIT |

		               FBINFO_HWACCEL_COPYAREA |

                	       FBINFO_HWACCEL_FILLRECT;

		break;

	case FB_ACCEL_NEOMAGIC_NM2230:

		snprintf(info->fix.id, sizeof(info->fix.id),

				"MagicGraph 256AV+");

		strscpy(info->fix.id, "Mag.Graph256AV+", sizeof(info->fix.id));

		info->flags |= FBINFO_HWACCEL_IMAGEBLIT |

		               FBINFO_HWACCEL_COPYAREA |

                	       FBINFO_HWACCEL_FILLRECT;

		break;

	case FB_ACCEL_NEOMAGIC_NM2360:

		snprintf(info->fix.id, sizeof(info->fix.id),

				"MagicGraph 256ZX");

		strscpy(info->fix.id, "MagicGraph256ZX", sizeof(info->fix.id));

		info->flags |= FBINFO_HWACCEL_IMAGEBLIT |

		               FBINFO_HWACCEL_COPYAREA |

                	       FBINFO_HWACCEL_FILLRECT;

		break;

	case FB_ACCEL_NEOMAGIC_NM2380:

		snprintf(info->fix.id, sizeof(info->fix.id),

				"MagicGraph 256XL+");

		strscpy(info->fix.id, "Mag.Graph256XL+", sizeof(info->fix.id));

		info->flags |= FBINFO_HWACCEL_IMAGEBLIT |

		               FBINFO_HWACCEL_COPYAREA |

                	       FBINFO_HWACCEL_FILLRECT;