* [Qemu-devel] [libfdt][PATCH v4] implement strnlen for systems that need it
@ 2017-10-26 1:13 ` John Arbuckle
0 siblings, 0 replies; 4+ messages in thread
From: John Arbuckle @ 2017-10-26 1:13 UTC (permalink / raw)
To: stefanha, peter.maydell, david, richard.henderson, qemu-devel,
qemu-ppc, devicetree-compiler, ian
Cc: John Arbuckle
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>
---
v4 changes:
- Added check for definition of MAC_OS_X_VERSION_10_7
- Renamed strnlen to fdt_strnlen
- Added macro that defines strnlen as fdt_strnlen
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 | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h
index 952056c..41fac04 100644
--- a/libfdt/libfdt_env.h
+++ b/libfdt/libfdt_env.h
@@ -109,4 +109,31 @@ static inline fdt64_t cpu_to_fdt64(uint64_t x)
#undef CPU_TO_FDT16
#undef EXTRACT_BYTE
+#ifdef __APPLE__
+#include <AvailabilityMacros.h>
+
+/* strnlen() is not available on Mac OS < 10.7 */
+# if !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED < \
+ MAC_OS_X_VERSION_10_7)
+
+#define strnlen fdt_strnlen
+
+/*
+ * fdt_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 fdt_strnlen(const char *string, size_t max_count)
+{
+ const char *p = memchr(string, 0, max_count);
+ return p ? p - string : max_count;
+}
+
+#endif /* !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED <
+ MAC_OS_X_VERSION_10_7) */
+
+#endif /* __APPLE__ */
+
#endif /* _LIBFDT_ENV_H */
--
2.10.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [libfdt][PATCH v4] implement strnlen for systems that need it
@ 2017-10-26 1:13 ` John Arbuckle
0 siblings, 0 replies; 4+ messages in thread
From: John Arbuckle @ 2017-10-26 1:13 UTC (permalink / raw)
To: stefanha-Re5JQEeQqe8AvxtiuMwx3w,
peter.maydell-QSEj5FYQhm4dnm+yROfE0A,
david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+,
richard.henderson-QSEj5FYQhm4dnm+yROfE0A,
qemu-devel-qX2TKyscuCcdnm+yROfE0A,
qemu-ppc-qX2TKyscuCcdnm+yROfE0A,
devicetree-compiler-u79uwXL29TY76Z2rM5mHXA,
ian-h+KGxgPPiopAfugRpC6u6w
Cc: John Arbuckle
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>
---
v4 changes:
- Added check for definition of MAC_OS_X_VERSION_10_7
- Renamed strnlen to fdt_strnlen
- Added macro that defines strnlen as fdt_strnlen
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 | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h
index 952056c..41fac04 100644
--- a/libfdt/libfdt_env.h
+++ b/libfdt/libfdt_env.h
@@ -109,4 +109,31 @@ static inline fdt64_t cpu_to_fdt64(uint64_t x)
#undef CPU_TO_FDT16
#undef EXTRACT_BYTE
+#ifdef __APPLE__
+#include <AvailabilityMacros.h>
+
+/* strnlen() is not available on Mac OS < 10.7 */
+# if !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED < \
+ MAC_OS_X_VERSION_10_7)
+
+#define strnlen fdt_strnlen
+
+/*
+ * fdt_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 fdt_strnlen(const char *string, size_t max_count)
+{
+ const char *p = memchr(string, 0, max_count);
+ return p ? p - string : max_count;
+}
+
+#endif /* !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED <
+ MAC_OS_X_VERSION_10_7) */
+
+#endif /* __APPLE__ */
+
#endif /* _LIBFDT_ENV_H */
--
2.10.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [libfdt][PATCH v4] implement strnlen for systems that need it
@ 2017-10-27 21:46 ` David Gibson
0 siblings, 0 replies; 4+ messages in thread
From: David Gibson @ 2017-10-27 21:46 UTC (permalink / raw)
To: John Arbuckle
Cc: stefanha, peter.maydell, richard.henderson, qemu-devel, qemu-ppc,
devicetree-compiler, ian
[-- Attachment #1: Type: text/plain, Size: 2203 bytes --]
On Wed, Oct 25, 2017 at 09:13:46PM -0400, John Arbuckle wrote:
> 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>
Applied, thanks.
> ---
> v4 changes:
> - Added check for definition of MAC_OS_X_VERSION_10_7
> - Renamed strnlen to fdt_strnlen
> - Added macro that defines strnlen as fdt_strnlen
>
> 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 | 27 +++++++++++++++++++++++++++
> 1 file changed, 27 insertions(+)
>
> diff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h
> index 952056c..41fac04 100644
> --- a/libfdt/libfdt_env.h
> +++ b/libfdt/libfdt_env.h
> @@ -109,4 +109,31 @@ static inline fdt64_t cpu_to_fdt64(uint64_t x)
> #undef CPU_TO_FDT16
> #undef EXTRACT_BYTE
>
> +#ifdef __APPLE__
> +#include <AvailabilityMacros.h>
> +
> +/* strnlen() is not available on Mac OS < 10.7 */
> +# if !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED < \
> + MAC_OS_X_VERSION_10_7)
> +
> +#define strnlen fdt_strnlen
> +
> +/*
> + * fdt_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 fdt_strnlen(const char *string, size_t max_count)
> +{
> + const char *p = memchr(string, 0, max_count);
> + return p ? p - string : max_count;
> +}
> +
> +#endif /* !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED <
> + MAC_OS_X_VERSION_10_7) */
> +
> +#endif /* __APPLE__ */
> +
> #endif /* _LIBFDT_ENV_H */
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [libfdt][PATCH v4] implement strnlen for systems that need it
@ 2017-10-27 21:46 ` David Gibson
0 siblings, 0 replies; 4+ messages in thread
From: David Gibson @ 2017-10-27 21:46 UTC (permalink / raw)
To: John Arbuckle
Cc: stefanha-Re5JQEeQqe8AvxtiuMwx3w,
peter.maydell-QSEj5FYQhm4dnm+yROfE0A,
richard.henderson-QSEj5FYQhm4dnm+yROfE0A,
qemu-devel-qX2TKyscuCcdnm+yROfE0A,
qemu-ppc-qX2TKyscuCcdnm+yROfE0A,
devicetree-compiler-u79uwXL29TY76Z2rM5mHXA,
ian-h+KGxgPPiopAfugRpC6u6w
[-- Attachment #1: Type: text/plain, Size: 2233 bytes --]
On Wed, Oct 25, 2017 at 09:13:46PM -0400, John Arbuckle wrote:
> 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>
Applied, thanks.
> ---
> v4 changes:
> - Added check for definition of MAC_OS_X_VERSION_10_7
> - Renamed strnlen to fdt_strnlen
> - Added macro that defines strnlen as fdt_strnlen
>
> 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 | 27 +++++++++++++++++++++++++++
> 1 file changed, 27 insertions(+)
>
> diff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h
> index 952056c..41fac04 100644
> --- a/libfdt/libfdt_env.h
> +++ b/libfdt/libfdt_env.h
> @@ -109,4 +109,31 @@ static inline fdt64_t cpu_to_fdt64(uint64_t x)
> #undef CPU_TO_FDT16
> #undef EXTRACT_BYTE
>
> +#ifdef __APPLE__
> +#include <AvailabilityMacros.h>
> +
> +/* strnlen() is not available on Mac OS < 10.7 */
> +# if !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED < \
> + MAC_OS_X_VERSION_10_7)
> +
> +#define strnlen fdt_strnlen
> +
> +/*
> + * fdt_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 fdt_strnlen(const char *string, size_t max_count)
> +{
> + const char *p = memchr(string, 0, max_count);
> + return p ? p - string : max_count;
> +}
> +
> +#endif /* !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED <
> + MAC_OS_X_VERSION_10_7) */
> +
> +#endif /* __APPLE__ */
> +
> #endif /* _LIBFDT_ENV_H */
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-10-27 21:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-26 1:13 [Qemu-devel] [libfdt][PATCH v4] implement strnlen for systems that need it John Arbuckle
2017-10-26 1:13 ` John Arbuckle
2017-10-27 21:46 ` [Qemu-devel] " David Gibson
2017-10-27 21:46 ` David Gibson
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.