threads / patch / 46440

patchmake get_be64() compile on pu with NO_UNALIGNED_LOADS

Subject: [PATCH] make get_be64() compile on pu with NO_UNALIGNED_LOADS

## tl;dr

2 messages between Jul 22, 2017 and Jul 22, 2017. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Martin Ågren· Jul 22, 2017, 09:47 UTC · lore

1. s/unit64_t/uint64_t/

2. add const-qualifier to *p

3. add missing closing ')'

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
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(-)

Show changes to compat/bswap.h +3 −3

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· Jul 22, 2017, 15:54 UTC · re: Martin Ågren · lore

Re: [PATCH] make get_be64() compile on pu with NO_UNALIGNED_LOADS

Martin Ågren <martin.agren@gmail.com> 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.

Show 23 quoted lines

>
>  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