From patchwork Wed Aug 15 13:11:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 957878 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=fwts-devel-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41r8xT1KSWz9sCn; Wed, 15 Aug 2018 23:11:41 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fpvaL-0003ob-GR; Wed, 15 Aug 2018 13:11:37 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1fpvaJ-0003m3-7e for fwts-devel@lists.ubuntu.com; Wed, 15 Aug 2018 13:11:35 +0000 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fpvaI-00086X-Bc; Wed, 15 Aug 2018 13:11:34 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH 08/27] lib: fwts_stringextras: fix some missing constifictions Date: Wed, 15 Aug 2018 14:11:10 +0100 Message-Id: <20180815131129.24146-9-colin.king@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180815131129.24146-1-colin.king@canonical.com> References: <20180815131129.24146-1-colin.king@canonical.com> MIME-Version: 1.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" From: Colin Ian King Fix up const pointer build warnings Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Ivan Hu --- src/lib/include/fwts_stringextras.h | 2 +- src/lib/src/fwts_stringextras.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/include/fwts_stringextras.h b/src/lib/include/fwts_stringextras.h index fba6688f..cd5fa822 100644 --- a/src/lib/include/fwts_stringextras.h +++ b/src/lib/include/fwts_stringextras.h @@ -24,7 +24,7 @@ void fwts_chop_newline(char *str); char *fwts_realloc_strcat(char *orig, const char *newstr); -char *fwts_string_endswith(const char *str, const char *postfix); +const char *fwts_string_endswith(const char *str, const char *postfix); void fwts_memcpy_unaligned(void *dst, const void *src, size_t n); #endif diff --git a/src/lib/src/fwts_stringextras.c b/src/lib/src/fwts_stringextras.c index a9b4c7cd..1f22224d 100644 --- a/src/lib/src/fwts_stringextras.c +++ b/src/lib/src/fwts_stringextras.c @@ -80,7 +80,7 @@ char *fwts_realloc_strcat(char *orig, const char *newstr) * see if str ends with postfix * return NULL if fails, otherwise return the matched substring */ -char* fwts_string_endswith(const char *str, const char *postfix) +const char *fwts_string_endswith(const char *str, const char *postfix) { size_t sl, pl; @@ -88,7 +88,7 @@ char* fwts_string_endswith(const char *str, const char *postfix) pl = strlen(postfix); if (pl == 0) - return (char*) str + sl; + return str + sl; if (sl < pl) return NULL; @@ -96,7 +96,7 @@ char* fwts_string_endswith(const char *str, const char *postfix) if (memcmp(str + sl - pl, postfix, pl) != 0) return NULL; - return (char*) str + sl - pl; + return str + sl - pl; } /* @@ -111,5 +111,5 @@ void fwts_memcpy_unaligned(void *dst, const void *src, size_t n) return; while (i--) - ((uint8_t*)dst)[i] = ((uint8_t*)src)[i]; + ((uint8_t *)dst)[i] = ((const uint8_t *)src)[i]; }