1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
1999-09-27  Andreas Jaeger  <aj@suse.de>

	* resolv/netdb.h: Remove declaration of getnodebyname.  It has
 	been renamed to getipnodebyname.  Move flags around.

1999-09-27  Andreas Schwab  <schwab@suse.de>

	* manual/message.texi (Locating gettext catalog): Fix typos.

1999-09-27  Andreas Jaeger  <aj@suse.de>

	* manual/socket.texi (Out-of-Band Data): Correct example program,
	rename some variables for clarity.
	Reported by James Antill <james@and.org>, close PR libc/1329.
This commit is contained in:
Ulrich Drepper
1999-09-28 04:54:04 +00:00
parent 508d9ff8ac
commit 9133b79b4f
5 changed files with 33 additions and 23 deletions

View File

@ -1,3 +1,18 @@
1999-09-27 Andreas Jaeger <aj@suse.de>
* resolv/netdb.h: Remove declaration of getnodebyname. It has
been renamed to getipnodebyname. Move flags around.
1999-09-27 Andreas Schwab <schwab@suse.de>
* manual/message.texi (Locating gettext catalog): Fix typos.
1999-09-27 Andreas Jaeger <aj@suse.de>
* manual/socket.texi (Out-of-Band Data): Correct example program,
rename some variables for clarity.
Reported by James Antill <james@and.org>, close PR libc/1329.
1999-09-27 Ulrich Drepper <drepper@cygnus.com> 1999-09-27 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/ld-collate.c (insert_value): Add hack to not * locale/programs/ld-collate.c (insert_value): Add hack to not

View File

@ -115,7 +115,7 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond,
pthread_exit(PTHREAD_CANCELED); pthread_exit(PTHREAD_CANCELED);
} }
/* If not signaled: also remove ourselves and return an error code, but /* If not signaled: also remove ourselves and return an error code, but
only if the timeout has elapsed. If not, jsut continue waiting. */ only if the timeout has elapsed. If not, just continue waiting. */
if (THREAD_GETMEM(self, p_signal) == 0) { if (THREAD_GETMEM(self, p_signal) == 0) {
if (retsleep != 0) if (retsleep != 0)
goto continue_waiting; goto continue_waiting;

View File

@ -1024,7 +1024,7 @@ really never should be used.
@end deftypefun @end deftypefun
@deftypefun {char *} bindtextdomain (const char *@var{domainname}, const char *@var{dirname}) @deftypefun {char *} bindtextdomain (const char *@var{domainname}, const char *@var{dirname})
The @code{bindtextdomain} function can be used to specify the directly The @code{bindtextdomain} function can be used to specify the directory
which contains the message catalogs for domain @var{domainname} for the which contains the message catalogs for domain @var{domainname} for the
different languages. To be correct, this is the directory where the different languages. To be correct, this is the directory where the
hierarchy of directories is expected. Details are explained below. hierarchy of directories is expected. Details are explained below.
@ -1051,7 +1051,7 @@ If the @var{dirname} parameter is the null pointer @code{bindtextdomain}
returns the currently selected directory for the domain with the name returns the currently selected directory for the domain with the name
@var{domainname}. @var{domainname}.
the @code{bindtextdomain} function returns a pointer to a string The @code{bindtextdomain} function returns a pointer to a string
containing the name of the selected directory name. The string is containing the name of the selected directory name. The string is
allocated internally in the function and must not be changed by the allocated internally in the function and must not be changed by the
user. If the system went out of core during the execution of user. If the system went out of core during the execution of

View File

@ -2512,7 +2512,7 @@ makes room. Here is an example:
@smallexample @smallexample
struct buffer struct buffer
@{ @{
char *buffer; char *buf;
int size; int size;
struct buffer *next; struct buffer *next;
@}; @};
@ -2536,18 +2536,19 @@ read_oob (int socket)
@{ @{
/* @r{This is an arbitrary limit.} /* @r{This is an arbitrary limit.}
@r{Does anyone know how to do this without a limit?} */ @r{Does anyone know how to do this without a limit?} */
char *buffer = (char *) xmalloc (1024); #define BUF_SZ 1024
char *buf = (char *) xmalloc (BUF_SZ);
int success; int success;
int atmark; int atmark;
/* @r{Try again to read the out-of-band data.} */ /* @r{Try again to read the out-of-band data.} */
success = recv (socket, buffer, sizeof buffer, MSG_OOB); success = recv (socket, buf, BUF_SZ, MSG_OOB);
if (success >= 0) if (success >= 0)
@{ @{
/* @r{We got it, so return it.} */ /* @r{We got it, so return it.} */
struct buffer *link struct buffer *link
= (struct buffer *) xmalloc (sizeof (struct buffer)); = (struct buffer *) xmalloc (sizeof (struct buffer));
link->buffer = buffer; link->buf = buf;
link->size = success; link->size = success;
link->next = list; link->next = list;
return link; return link;
@ -2568,7 +2569,7 @@ read_oob (int socket)
/* @r{Otherwise, read a bunch of ordinary data and save it.} /* @r{Otherwise, read a bunch of ordinary data and save it.}
@r{This is guaranteed not to read past the mark} @r{This is guaranteed not to read past the mark}
@r{if it starts before the mark.} */ @r{if it starts before the mark.} */
success = read (socket, buffer, sizeof buffer); success = read (socket, buf, BUF_SZ);
if (success < 0) if (success < 0)
perror ("read"); perror ("read");
@ -2576,7 +2577,7 @@ read_oob (int socket)
@{ @{
struct buffer *link struct buffer *link
= (struct buffer *) xmalloc (sizeof (struct buffer)); = (struct buffer *) xmalloc (sizeof (struct buffer));
link->buffer = buffer; link->buf = buf;
link->size = success; link->size = success;
/* @r{Add the new link to the end of the list.} */ /* @r{Add the new link to the end of the list.} */

View File

@ -132,13 +132,20 @@ extern struct hostent *getipnodebyaddr __P ((__const char *__addr,
int *__error_num)); int *__error_num));
/* Return entry from host data base for host with NAME and newly allocated /* Return entry from host data base for host with NAME and newly allocated
buffer. */ buffer. FLAGS is some combination of the following AI_* values. */
extern struct hostent *getipnodebyname __P ((__const char *__name, int __type, extern struct hostent *getipnodebyname __P ((__const char *__name, int __type,
int __flags, int *__error_num)); int __flags, int *__error_num));
# define AI_V4MAPPED 1 /* IPv4-mapped addresses are acceptable. */
# define AI_ALL 2 /* Return both IPv4 and IPv6 addresses. */
# define AI_ADDRCONFIG 4 /* Use configuration of this host to choose
returned address type. */
# define AI_DEFAULT (AI_V4MAPPED | AI_ADDRCONFIG)
/* Free structure returned by previous `getipnodebyaddr' or `getipnodebyname' /* Free structure returned by previous `getipnodebyaddr' or `getipnodebyname'
call. */ call. */
extern void freehostent __P ((struct hostent *__ptr)); extern void freehostent __P ((struct hostent *__ptr));
#endif #endif
#ifdef __USE_MISC #ifdef __USE_MISC
@ -173,19 +180,6 @@ extern int gethostbyname2_r __P ((__const char *__restrict __name, int __af,
#endif /* misc */ #endif /* misc */
/* Return entry from host data base for host with NAME. AF must be
set to the desired address type (either `AF_INET' or `AF_INET6').
FLAGS is some combination of the following AI_* values. */
extern struct hostent *getnodebyname __P ((__const char *__name, int __af,
int __flags));
#define AI_V4MAPPED 1 /* IPv4-mapped addresses are acceptable. */
#define AI_ALL 2 /* Return both IPv4 and IPv6 addresses. */
#define AI_ADDRCONFIG 4 /* Use configuration of this host to choose
returned address type. */
#define AI_DEFAULT (AI_V4MAPPED | AI_ADDRCONFIG)
/* Description of data base entry for a single network. NOTE: here a /* Description of data base entry for a single network. NOTE: here a
poor assumption is made. The network number is expected to fit poor assumption is made. The network number is expected to fit
into an unsigned long int variable. */ into an unsigned long int variable. */