summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2016-02-11 16:59:12 -0600
committerRob Herring <robh@kernel.org>2016-02-11 19:43:47 -0600
commit76df69806b7fafea013e2f4f82b0bd54498f3406 (patch)
tree4d65392973f6eeda1c65a0c746f84f5e270419d1
parent60c7f4cb1fa4df62b7ba07e9b087728ca7ce5bc8 (diff)
downloadblackbird-obmc-linux-76df69806b7fafea013e2f4f82b0bd54498f3406.tar.gz
blackbird-obmc-linux-76df69806b7fafea013e2f4f82b0bd54498f3406.zip
ARM: boot: Add an implementation of strnlen for libfdt
Recent versions of libfdt add a dependency on strnlen. Copy the implementation in lib/string.c here, so we can update libfdt. Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Rob Herring <robh@kernel.org>
-rw-r--r--arch/arm/boot/compressed/string.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/string.c b/arch/arm/boot/compressed/string.c
index 36e53ef9200f..689467448736 100644
--- a/arch/arm/boot/compressed/string.c
+++ b/arch/arm/boot/compressed/string.c
@@ -65,6 +65,15 @@ size_t strlen(const char *s)
return sc - s;
}
+size_t strnlen(const char *s, size_t count)
+{
+ const char *sc;
+
+ for (sc = s; count-- && *sc != '\0'; ++sc)
+ /* nothing */;
+ return sc - s;
+}
+
int memcmp(const void *cs, const void *ct, size_t count)
{
const unsigned char *su1 = cs, *su2 = ct, *end = su1 + count;
OpenPOWER on IntegriCloud