From 5c7f47ddc24b92ec2b345660b701c4bf1c0d8032 Mon Sep 17 00:00:00 2001 From: Ahelenia Ziemiańska Date: Fri, 9 Oct 2020 17:39:58 +0200 Subject: i386: fix string formatting-related warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixed the same way as in 70cca82 "kexec: Fix snprintf related compilation warnings" Signed-off-by: Ahelenia Ziemiańska Signed-off-by: Simon Horman --- kexec/arch/i386/x86-linux-setup.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c index 057ee146..76e11852 100644 --- a/kexec/arch/i386/x86-linux-setup.c +++ b/kexec/arch/i386/x86-linux-setup.c @@ -232,8 +232,14 @@ static int parse_edd_extensions(const char *dir, struct edd_info *edd_info) char line[1024]; uint16_t flags = 0; FILE *fp; + int ret; + + ret = snprintf(filename, PATH_MAX, "%s/%s", dir, "extensions"); + if (ret < 0 || ret >= PATH_MAX) { + fprintf(stderr, "snprintf failed: %s\n", strerror(errno)); + return -1; + } - snprintf(filename, PATH_MAX, "%s/%s", dir, "extensions"); filename[PATH_MAX-1] = 0; fp = fopen(filename, "r"); @@ -269,8 +275,14 @@ static int read_edd_raw_data(const char *dir, struct edd_info *edd_info) FILE *fp; size_t read_chars; uint16_t len; + int ret; + + ret = snprintf(filename, PATH_MAX, "%s/%s", dir, "raw_data"); + if (ret < 0 || ret >= PATH_MAX) { + fprintf(stderr, "snprintf failed: %s\n", strerror(errno)); + return -1; + } - snprintf(filename, PATH_MAX, "%s/%s", dir, "raw_data"); filename[PATH_MAX-1] = 0; fp = fopen(filename, "r"); -- cgit 1.2.3-korg