From: John Arbuckle <programmingkidx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@public.gmane.org,
richard.henderson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org,
qemu-devel-qX2TKyscuCcdnm+yROfE0A@public.gmane.org,
qemu-ppc-qX2TKyscuCcdnm+yROfE0A@public.gmane.org,
peter.maydell-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org,
devicetree-compiler-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
ian-h+KGxgPPiopAfugRpC6u6w@public.gmane.org
Cc: John Arbuckle <programmingkidx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: [libfdt][PATCH v3] implement strnlen for systems that need it
Date: Sun, 22 Oct 2017 22:50:16 -0400 [thread overview]
Message-ID: <20171023025016.3088-1-programmingkidx@gmail.com> (raw)
Prior the Mac OS 10.7, the function strnlen() was not available. This patch
implements strnlen() on Mac OS X versions that are below 10.7.
Signed-off-by: John Arbuckle <programmingkidx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
v3 changes:
- Replaced loop with memchr()
v2 changes:
- Simplified the code to make it static inline'ed
- Changed the type of count to size_t
libfdt/libfdt_env.h | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h
index 952056c..d43b66b 100644
--- a/libfdt/libfdt_env.h
+++ b/libfdt/libfdt_env.h
@@ -109,4 +109,28 @@ static inline fdt64_t cpu_to_fdt64(uint64_t x)
#undef CPU_TO_FDT16
#undef EXTRACT_BYTE
+#ifdef __APPLE__
+#include <AvailabilityMacros.h>
+
+#define MAC_OS_X_VERSION_10_7 1070
+
+/* strnlen() is not available on Mac OS < 10.7 */
+# if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7)
+
+/*
+ * strnlen: returns the length of a string or max_count - which ever is smallest
+ * Input 1 string: the string whose size is to be determined
+ * Input 2 max_count: the maximum value returned by this function
+ * Output: length of the string or max_count (the smallest of the two)
+ */
+static inline size_t strnlen(const char *string, size_t max_count)
+{
+ const char *p = memchr(string, 0, max_count);
+ return p ? p - string : max_count;
+}
+
+#endif /* (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7) */
+
+#endif /* __APPLE__ */
+
#endif /* _LIBFDT_ENV_H */
--
2.10.2
WARNING: multiple messages have this Message-ID (diff)
From: John Arbuckle <programmingkidx@gmail.com>
To: david@gibson.dropbear.id.au, richard.henderson@linaro.org,
qemu-devel@nongnu.org, qemu-ppc@nongnu.org,
peter.maydell@linaro.org, devicetree-compiler@vger.kernel.org,
ian@freebsd.org
Cc: John Arbuckle <programmingkidx@gmail.com>
Subject: [Qemu-devel] [libfdt][PATCH v3] implement strnlen for systems that need it
Date: Sun, 22 Oct 2017 22:50:16 -0400 [thread overview]
Message-ID: <20171023025016.3088-1-programmingkidx@gmail.com> (raw)
Prior the Mac OS 10.7, the function strnlen() was not available. This patch
implements strnlen() on Mac OS X versions that are below 10.7.
Signed-off-by: John Arbuckle <programmingkidx@gmail.com>
---
v3 changes:
- Replaced loop with memchr()
v2 changes:
- Simplified the code to make it static inline'ed
- Changed the type of count to size_t
libfdt/libfdt_env.h | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h
index 952056c..d43b66b 100644
--- a/libfdt/libfdt_env.h
+++ b/libfdt/libfdt_env.h
@@ -109,4 +109,28 @@ static inline fdt64_t cpu_to_fdt64(uint64_t x)
#undef CPU_TO_FDT16
#undef EXTRACT_BYTE
+#ifdef __APPLE__
+#include <AvailabilityMacros.h>
+
+#define MAC_OS_X_VERSION_10_7 1070
+
+/* strnlen() is not available on Mac OS < 10.7 */
+# if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7)
+
+/*
+ * strnlen: returns the length of a string or max_count - which ever is smallest
+ * Input 1 string: the string whose size is to be determined
+ * Input 2 max_count: the maximum value returned by this function
+ * Output: length of the string or max_count (the smallest of the two)
+ */
+static inline size_t strnlen(const char *string, size_t max_count)
+{
+ const char *p = memchr(string, 0, max_count);
+ return p ? p - string : max_count;
+}
+
+#endif /* (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7) */
+
+#endif /* __APPLE__ */
+
#endif /* _LIBFDT_ENV_H */
--
2.10.2
next reply other threads:[~2017-10-23 2:50 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-23 2:50 John Arbuckle [this message]
2017-10-23 2:50 ` [Qemu-devel] [libfdt][PATCH v3] implement strnlen for systems that need it John Arbuckle
[not found] ` <20171023025016.3088-1-programmingkidx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-10-23 16:09 ` Stefan Hajnoczi
2017-10-23 16:09 ` Stefan Hajnoczi
[not found] ` <20171023160959.GC10220-lxVrvc10SDRcolVlb+j0YCZi+YwRKgec@public.gmane.org>
2017-10-23 16:27 ` Peter Maydell
2017-10-23 16:27 ` Peter Maydell
[not found] ` <CAFEAcA_13y2-uM11Ko_79TpEsfpFWMTz2-mAiwFseHfAM5CPgA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-10-24 3:45 ` Programmingkid
2017-10-24 3:45 ` Programmingkid
[not found] ` <FC571E15-495F-4D4D-9001-7FF76A74D162-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-10-24 6:52 ` Peter Maydell
2017-10-24 6:52 ` Peter Maydell
2017-10-24 12:18 ` Stefan Hajnoczi
2017-10-24 12:18 ` Stefan Hajnoczi
[not found] ` <20171024121822.GE18756-lxVrvc10SDRcolVlb+j0YCZi+YwRKgec@public.gmane.org>
2017-10-25 16:18 ` Programmingkid
2017-10-25 16:18 ` Programmingkid
2017-10-24 3:13 ` Programmingkid
2017-10-24 3:13 ` Programmingkid
[not found] ` <2ACA132F-70DF-488A-AE41-59FFF08E8755-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-10-24 12:09 ` Stefan Hajnoczi
2017-10-24 12:09 ` Stefan Hajnoczi
[not found] ` <20171024120956.GD18756-lxVrvc10SDRcolVlb+j0YCZi+YwRKgec@public.gmane.org>
2017-10-24 13:37 ` Programmingkid
2017-10-24 13:37 ` Programmingkid
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171023025016.3088-1-programmingkidx@gmail.com \
--to=programmingkidx-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@public.gmane.org \
--cc=devicetree-compiler-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=ian-h+KGxgPPiopAfugRpC6u6w@public.gmane.org \
--cc=peter.maydell-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=qemu-devel-qX2TKyscuCcdnm+yROfE0A@public.gmane.org \
--cc=qemu-ppc-qX2TKyscuCcdnm+yROfE0A@public.gmane.org \
--cc=richard.henderson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.