Merge #11138: Compat: Simplify bswap_16 implementation

laanwj · laanwj · commit 298251161c7b · 2017-08-28T09:41:57.000+02:00
e40fa98 Simplify bswap_16 implementation (danra) Pull request description: Simplify bswap_16 implementation on platforms which don't already have it defined. This has no effect on the generated assembly; it just simplifies the source code. Tree-SHA512: 1c6ac1d187a2751da75256d12b6b890160d15246dd2c2b6a56748ec43482e3a5a3323be2910f07b42d3dc243a568c7412c26eaa036efec764436e988abd1c3f1
diff --git a/src/compat/byteswap.h b/src/compat/byteswap.h
@@ -35,7 +35,7 @@
 #if HAVE_DECL_BSWAP_16 == 0
 inline uint16_t bswap_16(uint16_t x)
 {
-    return (x >> 8) | ((x & 0x00ff) << 8);
+    return (x >> 8) | (x << 8);
 }
 #endif // HAVE_DECL_BSWAP16
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`#if HAVE_DECL_BSWAP_16 == 0`
`36`	`36`	`inline uint16_t bswap_16(uint16_t x)`
`37`	`37`	`{`
`38`		`- return (x >> 8) \| ((x & 0x00ff) << 8);`
	`38`	`+ return (x >> 8) \| (x << 8);`
`39`	`39`	`}`
`40`	`40`	`#endif // HAVE_DECL_BSWAP16`
`41`	`41`