lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

(put16): Remove __const. Fix access index. (put32): Remove __const. Use uint32_t instead of uint16_t.

Browse Source
This commit is contained in:
Ulrich Drepper
2000-03-31 03:43:13 +00:00
parent 9a95cd1c9c
commit cb2c55018f
2 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
iconv/loop.c
View File

@ -82,20 +82,20 @@
| ((__const unsigned char *) (addr))[1]) << 8 \ | ((__const unsigned char *) (addr))[1]) << 8 \
| ((__const unsigned char *) (addr))[0]) | ((__const unsigned char *) (addr))[0])
# 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) \
@ -107,20 +107,20 @@
| ((__const unsigned char *) (addr))[2]) << 8 \ | ((__const unsigned char *) (addr))[2]) << 8 \
| ((__const unsigned char *) (addr))[3]) | ((__const unsigned char *) (addr))[3])
# 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

36
iconv/skeleton.c
View File

@ -140,20 +140,20 @@ static int to_object;
| ((__const unsigned char *) (addr))[1]) << 8 \ | ((__const unsigned char *) (addr))[1]) << 8 \
| ((__const unsigned char *) (addr))[0]) | ((__const unsigned char *) (addr))[0])
# 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) \
@ -165,20 +165,20 @@ static int to_object;
| ((__const unsigned char *) (addr))[2]) << 8 \ | ((__const unsigned char *) (addr))[2]) << 8 \
| ((__const unsigned char *) (addr))[3]) | ((__const unsigned char *) (addr))[3])
# 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