From e5928728d5809e7042dd28c8cf307a194de39650 Mon Sep 17 00:00:00 2001 From: Franck LeCodeur Date: Thu, 16 Sep 2021 22:25:18 +0200 Subject: [PATCH] JPEG2000Translator: Fix -Werror warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fix is for ticket #9460 to potentially enable -Werror for JPEG2000Translator. Original warning: 'char* strncpy(char*, const char*, size_t)' specified bound equals destination size [-Wstringop-truncation] - Replaced several occurrences of same string with existing constant. - Use strcmp instead of strncmp as one string is guaranteed to be null-terminated - Replace strncpy use with strlcpy as seen in other code places. Change-Id: I5e7ed0de10dc40447a64fe77a7909af577e128ac Reviewed-on: https://review.haiku-os.org/c/haiku/+/4472 Reviewed-by: Jérôme Duval Tested-by: Commit checker robot --- .../translators/jpeg2000/JPEG2000Translator.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp b/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp index e17e6827bd..ecd4f4cad1 100644 --- a/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp +++ b/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp @@ -1242,15 +1242,15 @@ JP2Translator::PopulateInfoFromFormat(translator_info* info, info->group = formats[i].group; info->quality = formats[i].quality; info->capability = formats[i].capability; - if (strncmp(formats[i].name, - "Be Bitmap Format (JPEG2000Translator)", - sizeof("Be Bitmap Format (JPEG2000Translator)")) == 0) - strncpy(info->name, - B_TRANSLATE("Be Bitmap Format (JPEG2000Translator)"), + if (strcmp(formats[i].name, B_TRANSLATOR_BITMAP_DESCRIPTION) + == 0) { + strlcpy(info->name, + B_TRANSLATE(B_TRANSLATOR_BITMAP_DESCRIPTION), sizeof(info->name)); - else - strncpy(info->name, formats[i].name, sizeof(info->name)); - strncpy(info->MIME, formats[i].MIME, sizeof(info->MIME)); + } else { + strlcpy(info->name, formats[i].name, sizeof(info->name)); + } + strlcpy(info->MIME, formats[i].MIME, sizeof(info->MIME)); return B_OK; } }