mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-30 22:43:12 +03:00
(put16): Remove __const. Fix access index. (put32): Remove __const. Use uint32_t instead of uint16_t.
This commit is contained in:
38
iconv/loop.c
38
iconv/loop.c
@ -84,18 +84,18 @@
|
|||||||
|
|
||||||
# define put16(addr, val) \
|
# define put16(addr, val) \
|
||||||
({ uint16_t __val = (val); \
|
({ uint16_t __val = (val); \
|
||||||
((__const unsigned char *) (addr))[0] = __val; \
|
((unsigned char *) (addr))[0] = __val; \
|
||||||
((__const unsigned char *) (addr))[1] = __val >> 8; \
|
((unsigned char *) (addr))[1] = __val >> 8; \
|
||||||
(void) 0; })
|
(void) 0; })
|
||||||
# define put32(addr, val) \
|
# define put32(addr, val) \
|
||||||
({ uint16_t __val = (val); \
|
({ uint32_t __val = (val); \
|
||||||
((__const unsigned char *) (addr))[0] = __val; \
|
((unsigned char *) (addr))[0] = __val; \
|
||||||
__val >>= 8; \
|
__val >>= 8; \
|
||||||
((__const unsigned char *) (addr))[1] = __val; \
|
((unsigned char *) (addr))[1] = __val; \
|
||||||
__val >>= 8; \
|
__val >>= 8; \
|
||||||
((__const unsigned char *) (addr))[2] = __val; \
|
((unsigned char *) (addr))[2] = __val; \
|
||||||
__val >>= 8; \
|
__val >>= 8; \
|
||||||
((__const unsigned char *) (addr))[3] = __val; \
|
((unsigned char *) (addr))[3] = __val; \
|
||||||
(void) 0; })
|
(void) 0; })
|
||||||
# else
|
# else
|
||||||
# define get16(addr) \
|
# define get16(addr) \
|
||||||
@ -109,18 +109,18 @@
|
|||||||
|
|
||||||
# define put16(addr, val) \
|
# define put16(addr, val) \
|
||||||
({ uint16_t __val = (val); \
|
({ uint16_t __val = (val); \
|
||||||
((__const unsigned char *) (addr))[1] = __val; \
|
((unsigned char *) (addr))[1] = __val; \
|
||||||
((__const unsigned char *) (addr))[2] = __val >> 8; \
|
((unsigned char *) (addr))[2] = __val >> 8; \
|
||||||
(void) 0; })
|
(void) 0; })
|
||||||
# define put32(addr, val) \
|
# define put32(addr, val) \
|
||||||
({ uint16_t __val = (val); \
|
({ uint32_t __val = (val); \
|
||||||
((__const unsigned char *) (addr))[3] = __val; \
|
((unsigned char *) (addr))[3] = __val; \
|
||||||
__val >>= 8; \
|
__val >>= 8; \
|
||||||
((__const unsigned char *) (addr))[2] = __val; \
|
((unsigned char *) (addr))[2] = __val; \
|
||||||
__val >>= 8; \
|
__val >>= 8; \
|
||||||
((__const unsigned char *) (addr))[1] = __val; \
|
((unsigned char *) (addr))[1] = __val; \
|
||||||
__val >>= 8; \
|
__val >>= 8; \
|
||||||
((__const unsigned char *) (addr))[0] = __val; \
|
((unsigned char *) (addr))[0] = __val; \
|
||||||
(void) 0; })
|
(void) 0; })
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
@ -261,6 +261,11 @@ FCTNAME (LOOPFCT) (const unsigned char **inptrp, const unsigned char *inend,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#undef get16
|
||||||
|
#undef get32
|
||||||
|
#undef put16
|
||||||
|
#undef put32
|
||||||
|
|
||||||
/* Include the file a second time to define the function to define the
|
/* Include the file a second time to define the function to define the
|
||||||
function to handle unaligned access. */
|
function to handle unaligned access. */
|
||||||
#if !defined _STRING_ARCH_unaligned && !defined DEFINE_UNALIGNED
|
#if !defined _STRING_ARCH_unaligned && !defined DEFINE_UNALIGNED
|
||||||
@ -282,8 +287,3 @@ FCTNAME (LOOPFCT) (const unsigned char **inptrp, const unsigned char *inend,
|
|||||||
#undef EXTRA_LOOP_DECLS
|
#undef EXTRA_LOOP_DECLS
|
||||||
#undef INIT_PARAMS
|
#undef INIT_PARAMS
|
||||||
#undef UPDATE_PARAMS
|
#undef UPDATE_PARAMS
|
||||||
|
|
||||||
#undef get16
|
|
||||||
#undef get32
|
|
||||||
#undef put16
|
|
||||||
#undef put32
|
|
||||||
|
@ -142,18 +142,18 @@ static int to_object;
|
|||||||
|
|
||||||
# define put16(addr, val) \
|
# define put16(addr, val) \
|
||||||
({ uint16_t __val = (val); \
|
({ uint16_t __val = (val); \
|
||||||
((__const unsigned char *) (addr))[0] = __val; \
|
((unsigned char *) (addr))[0] = __val; \
|
||||||
((__const unsigned char *) (addr))[1] = __val >> 8; \
|
((unsigned char *) (addr))[1] = __val >> 8; \
|
||||||
(void) 0; })
|
(void) 0; })
|
||||||
# define put32(addr, val) \
|
# define put32(addr, val) \
|
||||||
({ uint16_t __val = (val); \
|
({ uint32_t __val = (val); \
|
||||||
((__const unsigned char *) (addr))[0] = __val; \
|
((unsigned char *) (addr))[0] = __val; \
|
||||||
__val >>= 8; \
|
__val >>= 8; \
|
||||||
((__const unsigned char *) (addr))[1] = __val; \
|
((unsigned char *) (addr))[1] = __val; \
|
||||||
__val >>= 8; \
|
__val >>= 8; \
|
||||||
((__const unsigned char *) (addr))[2] = __val; \
|
((unsigned char *) (addr))[2] = __val; \
|
||||||
__val >>= 8; \
|
__val >>= 8; \
|
||||||
((__const unsigned char *) (addr))[3] = __val; \
|
((unsigned char *) (addr))[3] = __val; \
|
||||||
(void) 0; })
|
(void) 0; })
|
||||||
# else
|
# else
|
||||||
# define get16(addr) \
|
# define get16(addr) \
|
||||||
@ -167,18 +167,18 @@ static int to_object;
|
|||||||
|
|
||||||
# define put16(addr, val) \
|
# define put16(addr, val) \
|
||||||
({ uint16_t __val = (val); \
|
({ uint16_t __val = (val); \
|
||||||
((__const unsigned char *) (addr))[1] = __val; \
|
((unsigned char *) (addr))[1] = __val; \
|
||||||
((__const unsigned char *) (addr))[2] = __val >> 8; \
|
((unsigned char *) (addr))[2] = __val >> 8; \
|
||||||
(void) 0; })
|
(void) 0; })
|
||||||
# define put32(addr, val) \
|
# define put32(addr, val) \
|
||||||
({ uint16_t __val = (val); \
|
({ uint32_t __val = (val); \
|
||||||
((__const unsigned char *) (addr))[3] = __val; \
|
((unsigned char *) (addr))[3] = __val; \
|
||||||
__val >>= 8; \
|
__val >>= 8; \
|
||||||
((__const unsigned char *) (addr))[2] = __val; \
|
((unsigned char *) (addr))[2] = __val; \
|
||||||
__val >>= 8; \
|
__val >>= 8; \
|
||||||
((__const unsigned char *) (addr))[1] = __val; \
|
((unsigned char *) (addr))[1] = __val; \
|
||||||
__val >>= 8; \
|
__val >>= 8; \
|
||||||
((__const unsigned char *) (addr))[0] = __val; \
|
((unsigned char *) (addr))[0] = __val; \
|
||||||
(void) 0; })
|
(void) 0; })
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user