# [PATCH] make get_be64() compile on pu with NO_UNALIGNED_LOADS 2 messages from 2017-07-22 to 2017-07-22. Participants: Martin Ågren, Junio C Hamano. Thread: https://gitlist.dev/t/46440 ## Martin Ågren, 2017-07-22 09:47 Subject: [PATCH] make get_be64() compile on pu with NO_UNALIGNED_LOADS Message-ID: <20170722094717.16305-1-martin.agren@gmail.com> URL: https://gitlist.dev/e/20170722094717.16305-1-martin.agren%40gmail.com ``` 1. s/unit64_t/uint64_t/ 2. add const-qualifier to *p 3. add missing closing ')' Signed-off-by: Martin Ågren --- Applies to pu and passes the tests. I think this should be squashed in somewhere. Perhaps a mismerge in commit d553324d ("Merge branch 'bp/fsmonitor' into pu", 2017-07-21). compat/bswap.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compat/bswap.h b/compat/bswap.h index 133da1d2b..f86110a72 100644 --- a/compat/bswap.h +++ b/compat/bswap.h @@ -188,11 +188,11 @@ static inline void put_be32(void *ptr, uint32_t value) p[3] = value >> 0; } -static inline unit64_t get_be64(const void *ptr) +static inline uint64_t get_be64(const void *ptr) { - unsigned char *p = ptr; + const unsigned char *p = ptr; return ((uint64_t)get_be32(p) << 32) | - ((uint64_t)get_be32(p + 4); + ((uint64_t)get_be32(p + 4)); } #endif -- 2.14.0.rc0.14.g12cc05b53 ``` ## Junio C Hamano, 2017-07-22 15:54 Subject: Re: [PATCH] make get_be64() compile on pu with NO_UNALIGNED_LOADS Message-ID: URL: https://gitlist.dev/e/xmqq60ekfow8.fsf%40gitster.mtv.corp.google.com In-Reply-To: <20170722094717.16305-1-martin.agren@gmail.com> ``` Martin Ågren writes: > Applies to pu and passes the tests. I think this should be squashed in > somewhere. Perhaps a mismerge in commit d553324d ("Merge branch > 'bp/fsmonitor' into pu", 2017-07-21). Yes, you spotted a mistaken evil-merge. Thanks. > > compat/bswap.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/compat/bswap.h b/compat/bswap.h > index 133da1d2b..f86110a72 100644 > --- a/compat/bswap.h > +++ b/compat/bswap.h > @@ -188,11 +188,11 @@ static inline void put_be32(void *ptr, uint32_t value) > p[3] = value >> 0; > } > > -static inline unit64_t get_be64(const void *ptr) > +static inline uint64_t get_be64(const void *ptr) > { > - unsigned char *p = ptr; > + const unsigned char *p = ptr; > return ((uint64_t)get_be32(p) << 32) | > - ((uint64_t)get_be32(p + 4); > + ((uint64_t)get_be32(p + 4)); > } > > #endif ```