[BZ #284, BZ #721]
* intl/dcigettext.c (_nl_find_msg): Add a cast.
* nis/nis_clone_dir.c (nis_clone_directory): Use char * for ADDR.
* nis/nis_clone_obj.c (nis_clone_object): Likewise.
* nis/nis_clone_res.c (nis_clone_result): Likewise.
* resolv/nss_dns/dns-network.c (getanswer_r): Use const unsigned char *
for END_OF_MESSAGE and CP.
* resolv/res_send.c (send_dg): Add else branch for case impossible
unless `poll' is buggy.
* crypt/crypt_util.c (__setkey_r): Add a cast.
* locale/programs/linereader.c (get_toplvl_escape): Use size_t for
NBYTES, and unsigned char * for BYTES.
* locale/programs/charmap.c (charmap_new_char): Use size_t and
unsighed char * for NBYTES, BYTES parameters.
* sysdeps/generic/dl-hash.h (_dl_elf_hash): Take const char * argument
and cast it.
* sysdeps/i386/i686/dl-hash.h (_dl_elf_hash): Likewise.
* sunrpc/create_xid.c (_create_xid): Don't use unsigned long for RES.
* sunrpc/svcauth_des.c (_svcauth_des): Fix cast type.
* sunrpc/auth_des.c (authdes_create): Don't use u_char for PKEY_DATA.
(authdes_marshal): Don't use unsigned int for LEN.
* sunrpc/xdr.c (xdr_hyper): Don't use unsigned long for T2.
(xdr_u_hyper): Likewise.
(xdr_u_short): Don't use u_long for L.
* sunrpc/xdr_intXX_t.c (xdr_int64_t): Don't use uint32_t for T2.
* inet/rexec.c (rexec_af): Use socklen_t.
* sunrpc/key_call.c (getkeyserv_handle): Likewise.
* sunrpc/rtime.c (rtime): Likewise.
* resolv/res_send.c (send_vc, send_dg): Likewise.
* nis/nis_callback.c (__nis_create_callback): Likewise.
* sysdeps/generic/libc-start.c: Use unsigned int for nthreads ptr.
* sysdeps/posix/getaddrinfo.c (gaih_inet): Fix type of ADDR local.
* libio/libio.h (_IO_BE): Add parenthesis around EXPR.
* intl/dcigettext.c (INTVARDEF, INTUSE): Macros removed.
(_nl_default_dirname): Use libc_hidden_data_def instead of INTVARDEF.
(libc_freeres_fn, DCIGETTEXT): Don't use INTUSE.
* intl/bindtextdom.c (INTUSE): Macro removed.
(_nl_default_dirname): Use libc_hidden_proto.
(set_binding_values): Don't use INTUSE.
* include/libintl.h (_libc_intl_domainname_internal): Decl removed.
(_libc_intl_domainname): Use libc_hidden_proto.
* posix/regex_internal.h (gettext): Remove INTUSE on it.
* locale/SYS_libc.c (_libc_intl_domainname): Use libc_hidden_data_def
rather than INTDEF.
* include/libintl.h (_): Don't use *_internal name.
* ctype/ctype-extn.c (__ctype_tolower, __ctype_toupper): Use int32_t,
not uint32_t.
* locale/lc-ctype.c (_nl_postload_ctype): Likewise for assignments.
* iconv/gconv_open.c (__gconv_open): Remove useless cast.
[BZ #721]
* sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside
of [RESOLVE_MAP].
* sysdeps/sh/dl-machine.h (ELF_MACHINE_NO_REL): Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.h
(elf_machine_rel, elf_machine_rel_relative): Removed.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rel, elf_machine_rel_relative): Removed.
2005-02-03 Alexandre Oliva <aoliva@redhat.com>
[BZ #721]
* elf/dynamic-link.h: Don't declare nested auto functions that are
not going to be defined.
2004-07-23 Jakub Jelinek <jakub@redhat.com>
[BZ #284]
* include/features.h (_POSIX_SOURCE, _POSIX_C_SOURCE): Define
if _XOPEN_SOURCE >= 500 even if __STRICT_ANSI__ is defined.
2005-02-16 Roland McGrath <roland@redhat.com>
2005-02-17 02:19:55 +01:00
|
|
|
/* Copyright (c) 1998, 1999, 2000, 2004, 2005 Free Software Foundation, Inc.
|
1998-11-30 17:42:19 +01:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 06:58:11 +02:00
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
1998-11-30 17:42:19 +01:00
|
|
|
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2001-07-06 06:58:11 +02:00
|
|
|
Lesser General Public License for more details.
|
1998-11-30 17:42:19 +01:00
|
|
|
|
2001-07-06 06:58:11 +02:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
|
|
License along with the GNU C Library; if not, write to the Free
|
|
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
|
|
02111-1307 USA. */
|
1998-11-30 17:42:19 +01:00
|
|
|
|
|
|
|
#include <rpc/types.h>
|
2004-09-28 05:02:24 +02:00
|
|
|
|
|
|
|
/* We play dirty tricks with aliases. */
|
|
|
|
#define xdr_quad_t Xdr_quad_t
|
|
|
|
#define xdr_u_quad_t Xdr_u_quad_t
|
1998-11-30 17:42:19 +01:00
|
|
|
#include <rpc/xdr.h>
|
2004-09-28 05:02:24 +02:00
|
|
|
#undef xdr_quad_t
|
|
|
|
#undef xdr_u_quad_t
|
|
|
|
|
1998-11-30 17:42:19 +01:00
|
|
|
|
1999-04-08 04:10:39 +02:00
|
|
|
/* XDR 64bit integers */
|
|
|
|
bool_t
|
|
|
|
xdr_int64_t (XDR *xdrs, int64_t *ip)
|
|
|
|
{
|
[BZ #284, BZ #721]
* intl/dcigettext.c (_nl_find_msg): Add a cast.
* nis/nis_clone_dir.c (nis_clone_directory): Use char * for ADDR.
* nis/nis_clone_obj.c (nis_clone_object): Likewise.
* nis/nis_clone_res.c (nis_clone_result): Likewise.
* resolv/nss_dns/dns-network.c (getanswer_r): Use const unsigned char *
for END_OF_MESSAGE and CP.
* resolv/res_send.c (send_dg): Add else branch for case impossible
unless `poll' is buggy.
* crypt/crypt_util.c (__setkey_r): Add a cast.
* locale/programs/linereader.c (get_toplvl_escape): Use size_t for
NBYTES, and unsigned char * for BYTES.
* locale/programs/charmap.c (charmap_new_char): Use size_t and
unsighed char * for NBYTES, BYTES parameters.
* sysdeps/generic/dl-hash.h (_dl_elf_hash): Take const char * argument
and cast it.
* sysdeps/i386/i686/dl-hash.h (_dl_elf_hash): Likewise.
* sunrpc/create_xid.c (_create_xid): Don't use unsigned long for RES.
* sunrpc/svcauth_des.c (_svcauth_des): Fix cast type.
* sunrpc/auth_des.c (authdes_create): Don't use u_char for PKEY_DATA.
(authdes_marshal): Don't use unsigned int for LEN.
* sunrpc/xdr.c (xdr_hyper): Don't use unsigned long for T2.
(xdr_u_hyper): Likewise.
(xdr_u_short): Don't use u_long for L.
* sunrpc/xdr_intXX_t.c (xdr_int64_t): Don't use uint32_t for T2.
* inet/rexec.c (rexec_af): Use socklen_t.
* sunrpc/key_call.c (getkeyserv_handle): Likewise.
* sunrpc/rtime.c (rtime): Likewise.
* resolv/res_send.c (send_vc, send_dg): Likewise.
* nis/nis_callback.c (__nis_create_callback): Likewise.
* sysdeps/generic/libc-start.c: Use unsigned int for nthreads ptr.
* sysdeps/posix/getaddrinfo.c (gaih_inet): Fix type of ADDR local.
* libio/libio.h (_IO_BE): Add parenthesis around EXPR.
* intl/dcigettext.c (INTVARDEF, INTUSE): Macros removed.
(_nl_default_dirname): Use libc_hidden_data_def instead of INTVARDEF.
(libc_freeres_fn, DCIGETTEXT): Don't use INTUSE.
* intl/bindtextdom.c (INTUSE): Macro removed.
(_nl_default_dirname): Use libc_hidden_proto.
(set_binding_values): Don't use INTUSE.
* include/libintl.h (_libc_intl_domainname_internal): Decl removed.
(_libc_intl_domainname): Use libc_hidden_proto.
* posix/regex_internal.h (gettext): Remove INTUSE on it.
* locale/SYS_libc.c (_libc_intl_domainname): Use libc_hidden_data_def
rather than INTDEF.
* include/libintl.h (_): Don't use *_internal name.
* ctype/ctype-extn.c (__ctype_tolower, __ctype_toupper): Use int32_t,
not uint32_t.
* locale/lc-ctype.c (_nl_postload_ctype): Likewise for assignments.
* iconv/gconv_open.c (__gconv_open): Remove useless cast.
[BZ #721]
* sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside
of [RESOLVE_MAP].
* sysdeps/sh/dl-machine.h (ELF_MACHINE_NO_REL): Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.h
(elf_machine_rel, elf_machine_rel_relative): Removed.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rel, elf_machine_rel_relative): Removed.
2005-02-03 Alexandre Oliva <aoliva@redhat.com>
[BZ #721]
* elf/dynamic-link.h: Don't declare nested auto functions that are
not going to be defined.
2004-07-23 Jakub Jelinek <jakub@redhat.com>
[BZ #284]
* include/features.h (_POSIX_SOURCE, _POSIX_C_SOURCE): Define
if _XOPEN_SOURCE >= 500 even if __STRICT_ANSI__ is defined.
2005-02-16 Roland McGrath <roland@redhat.com>
2005-02-17 02:19:55 +01:00
|
|
|
int32_t t1, t2;
|
1999-04-08 04:10:39 +02:00
|
|
|
|
|
|
|
switch (xdrs->x_op)
|
|
|
|
{
|
|
|
|
case XDR_ENCODE:
|
|
|
|
t1 = (int32_t) ((*ip) >> 32);
|
|
|
|
t2 = (int32_t) (*ip);
|
|
|
|
return (XDR_PUTINT32(xdrs, &t1) && XDR_PUTINT32(xdrs, &t2));
|
|
|
|
case XDR_DECODE:
|
|
|
|
if (!XDR_GETINT32(xdrs, &t1) || !XDR_GETINT32(xdrs, &t2))
|
|
|
|
return FALSE;
|
|
|
|
*ip = ((int64_t) t1) << 32;
|
[BZ #284, BZ #721]
* intl/dcigettext.c (_nl_find_msg): Add a cast.
* nis/nis_clone_dir.c (nis_clone_directory): Use char * for ADDR.
* nis/nis_clone_obj.c (nis_clone_object): Likewise.
* nis/nis_clone_res.c (nis_clone_result): Likewise.
* resolv/nss_dns/dns-network.c (getanswer_r): Use const unsigned char *
for END_OF_MESSAGE and CP.
* resolv/res_send.c (send_dg): Add else branch for case impossible
unless `poll' is buggy.
* crypt/crypt_util.c (__setkey_r): Add a cast.
* locale/programs/linereader.c (get_toplvl_escape): Use size_t for
NBYTES, and unsigned char * for BYTES.
* locale/programs/charmap.c (charmap_new_char): Use size_t and
unsighed char * for NBYTES, BYTES parameters.
* sysdeps/generic/dl-hash.h (_dl_elf_hash): Take const char * argument
and cast it.
* sysdeps/i386/i686/dl-hash.h (_dl_elf_hash): Likewise.
* sunrpc/create_xid.c (_create_xid): Don't use unsigned long for RES.
* sunrpc/svcauth_des.c (_svcauth_des): Fix cast type.
* sunrpc/auth_des.c (authdes_create): Don't use u_char for PKEY_DATA.
(authdes_marshal): Don't use unsigned int for LEN.
* sunrpc/xdr.c (xdr_hyper): Don't use unsigned long for T2.
(xdr_u_hyper): Likewise.
(xdr_u_short): Don't use u_long for L.
* sunrpc/xdr_intXX_t.c (xdr_int64_t): Don't use uint32_t for T2.
* inet/rexec.c (rexec_af): Use socklen_t.
* sunrpc/key_call.c (getkeyserv_handle): Likewise.
* sunrpc/rtime.c (rtime): Likewise.
* resolv/res_send.c (send_vc, send_dg): Likewise.
* nis/nis_callback.c (__nis_create_callback): Likewise.
* sysdeps/generic/libc-start.c: Use unsigned int for nthreads ptr.
* sysdeps/posix/getaddrinfo.c (gaih_inet): Fix type of ADDR local.
* libio/libio.h (_IO_BE): Add parenthesis around EXPR.
* intl/dcigettext.c (INTVARDEF, INTUSE): Macros removed.
(_nl_default_dirname): Use libc_hidden_data_def instead of INTVARDEF.
(libc_freeres_fn, DCIGETTEXT): Don't use INTUSE.
* intl/bindtextdom.c (INTUSE): Macro removed.
(_nl_default_dirname): Use libc_hidden_proto.
(set_binding_values): Don't use INTUSE.
* include/libintl.h (_libc_intl_domainname_internal): Decl removed.
(_libc_intl_domainname): Use libc_hidden_proto.
* posix/regex_internal.h (gettext): Remove INTUSE on it.
* locale/SYS_libc.c (_libc_intl_domainname): Use libc_hidden_data_def
rather than INTDEF.
* include/libintl.h (_): Don't use *_internal name.
* ctype/ctype-extn.c (__ctype_tolower, __ctype_toupper): Use int32_t,
not uint32_t.
* locale/lc-ctype.c (_nl_postload_ctype): Likewise for assignments.
* iconv/gconv_open.c (__gconv_open): Remove useless cast.
[BZ #721]
* sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside
of [RESOLVE_MAP].
* sysdeps/sh/dl-machine.h (ELF_MACHINE_NO_REL): Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.h
(elf_machine_rel, elf_machine_rel_relative): Removed.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rel, elf_machine_rel_relative): Removed.
2005-02-03 Alexandre Oliva <aoliva@redhat.com>
[BZ #721]
* elf/dynamic-link.h: Don't declare nested auto functions that are
not going to be defined.
2004-07-23 Jakub Jelinek <jakub@redhat.com>
[BZ #284]
* include/features.h (_POSIX_SOURCE, _POSIX_C_SOURCE): Define
if _XOPEN_SOURCE >= 500 even if __STRICT_ANSI__ is defined.
2005-02-16 Roland McGrath <roland@redhat.com>
2005-02-17 02:19:55 +01:00
|
|
|
*ip |= (uint32_t) t2; /* Avoid sign extension. */
|
1999-04-08 04:10:39 +02:00
|
|
|
return TRUE;
|
|
|
|
case XDR_FREE:
|
|
|
|
return TRUE;
|
|
|
|
default:
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
2004-09-28 05:02:24 +02:00
|
|
|
strong_alias (xdr_int64_t, xdr_quad_t)
|
1999-04-08 04:10:39 +02:00
|
|
|
|
|
|
|
/* XDR 64bit unsigned integers */
|
|
|
|
bool_t
|
|
|
|
xdr_uint64_t (XDR *xdrs, uint64_t *uip)
|
|
|
|
{
|
|
|
|
uint32_t t1;
|
|
|
|
uint32_t t2;
|
|
|
|
|
|
|
|
switch (xdrs->x_op)
|
|
|
|
{
|
|
|
|
case XDR_ENCODE:
|
|
|
|
t1 = (uint32_t) ((*uip) >> 32);
|
|
|
|
t2 = (uint32_t) (*uip);
|
|
|
|
return (XDR_PUTINT32 (xdrs, (int32_t *) &t1) &&
|
|
|
|
XDR_PUTINT32(xdrs, (int32_t *) &t2));
|
|
|
|
case XDR_DECODE:
|
|
|
|
if (!XDR_GETINT32(xdrs, (int32_t *) &t1) ||
|
|
|
|
!XDR_GETINT32(xdrs, (int32_t *) &t2))
|
|
|
|
return FALSE;
|
|
|
|
*uip = ((uint64_t) t1) << 32;
|
|
|
|
*uip |= t2;
|
|
|
|
return TRUE;
|
|
|
|
case XDR_FREE:
|
|
|
|
return TRUE;
|
|
|
|
default:
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
2004-09-28 05:02:24 +02:00
|
|
|
strong_alias (xdr_int64_t, xdr_u_quad_t)
|
1999-04-08 04:10:39 +02:00
|
|
|
|
1998-11-30 17:42:19 +01:00
|
|
|
/* XDR 32bit integers */
|
|
|
|
bool_t
|
|
|
|
xdr_int32_t (XDR *xdrs, int32_t *lp)
|
|
|
|
{
|
|
|
|
switch (xdrs->x_op)
|
|
|
|
{
|
|
|
|
case XDR_ENCODE:
|
|
|
|
return XDR_PUTINT32 (xdrs, lp);
|
|
|
|
case XDR_DECODE:
|
|
|
|
return XDR_GETINT32 (xdrs, lp);
|
|
|
|
case XDR_FREE:
|
|
|
|
return TRUE;
|
|
|
|
default:
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* XDR 32bit unsigned integers */
|
|
|
|
bool_t
|
|
|
|
xdr_uint32_t (XDR *xdrs, uint32_t *ulp)
|
|
|
|
{
|
|
|
|
switch (xdrs->x_op)
|
|
|
|
{
|
|
|
|
case XDR_ENCODE:
|
|
|
|
return XDR_PUTINT32 (xdrs, (int32_t *) ulp);
|
1999-04-08 04:10:39 +02:00
|
|
|
case XDR_DECODE:
|
|
|
|
return XDR_GETINT32 (xdrs, (int32_t *) ulp);
|
1998-11-30 17:42:19 +01:00
|
|
|
case XDR_FREE:
|
|
|
|
return TRUE;
|
|
|
|
default:
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* XDR 16bit integers */
|
|
|
|
bool_t
|
|
|
|
xdr_int16_t (XDR *xdrs, int16_t *ip)
|
|
|
|
{
|
|
|
|
int32_t t;
|
|
|
|
|
|
|
|
switch (xdrs->x_op)
|
|
|
|
{
|
|
|
|
case XDR_ENCODE:
|
|
|
|
t = (int32_t) *ip;
|
|
|
|
return XDR_PUTINT32 (xdrs, &t);
|
|
|
|
case XDR_DECODE:
|
|
|
|
if (!XDR_GETINT32 (xdrs, &t))
|
|
|
|
return FALSE;
|
|
|
|
*ip = (int16_t) t;
|
|
|
|
return TRUE;
|
|
|
|
case XDR_FREE:
|
|
|
|
return TRUE;
|
|
|
|
default:
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* XDR 16bit unsigned integers */
|
|
|
|
bool_t
|
|
|
|
xdr_uint16_t (XDR *xdrs, uint16_t *uip)
|
|
|
|
{
|
|
|
|
uint32_t ut;
|
|
|
|
|
|
|
|
switch (xdrs->x_op)
|
|
|
|
{
|
|
|
|
case XDR_ENCODE:
|
2000-03-03 22:07:41 +01:00
|
|
|
ut = (uint32_t) *uip;
|
|
|
|
return XDR_PUTINT32 (xdrs, (int32_t *) &ut);
|
|
|
|
case XDR_DECODE:
|
|
|
|
if (!XDR_GETINT32 (xdrs, (int32_t *) &ut))
|
1998-11-30 17:42:19 +01:00
|
|
|
return FALSE;
|
|
|
|
*uip = (uint16_t) ut;
|
|
|
|
return TRUE;
|
|
|
|
case XDR_FREE:
|
|
|
|
return TRUE;
|
|
|
|
default:
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* XDR 8bit integers */
|
|
|
|
bool_t
|
|
|
|
xdr_int8_t (XDR *xdrs, int8_t *ip)
|
|
|
|
{
|
|
|
|
int32_t t;
|
|
|
|
|
|
|
|
switch (xdrs->x_op)
|
|
|
|
{
|
|
|
|
case XDR_ENCODE:
|
|
|
|
t = (int32_t) *ip;
|
|
|
|
return XDR_PUTINT32 (xdrs, &t);
|
|
|
|
case XDR_DECODE:
|
|
|
|
if (!XDR_GETINT32 (xdrs, &t))
|
|
|
|
return FALSE;
|
|
|
|
*ip = (int8_t) t;
|
|
|
|
return TRUE;
|
|
|
|
case XDR_FREE:
|
|
|
|
return TRUE;
|
|
|
|
default:
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* XDR 8bit unsigned integers */
|
|
|
|
bool_t
|
|
|
|
xdr_uint8_t (XDR *xdrs, uint8_t *uip)
|
|
|
|
{
|
|
|
|
uint32_t ut;
|
|
|
|
|
|
|
|
switch (xdrs->x_op)
|
|
|
|
{
|
|
|
|
case XDR_ENCODE:
|
2000-05-26 11:16:40 +02:00
|
|
|
ut = (uint32_t) *uip;
|
|
|
|
return XDR_PUTINT32 (xdrs, (int32_t *) &ut);
|
|
|
|
case XDR_DECODE:
|
|
|
|
if (!XDR_GETINT32 (xdrs, (int32_t *) &ut))
|
1998-11-30 17:42:19 +01:00
|
|
|
return FALSE;
|
|
|
|
*uip = (uint8_t) ut;
|
|
|
|
return TRUE;
|
|
|
|
case XDR_FREE:
|
|
|
|
return TRUE;
|
|
|
|
default:
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|