diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-08-25 17:19:50 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-08-25 17:19:50 +0000 |
| commit | 71d3bda9a7a15bf3f935ffcde8aeceefef8074f7 (patch) | |
| tree | 3188ef1b1ad5a60d512813dadfc756225dda0ff4 /nss/nss_files/files-parse.c | |
| parent | ad65970214c9dfaa6b61b9519cb0667b376e14d9 (diff) | |
| download | glibc-71d3bda9a7a15bf3f935ffcde8aeceefef8074f7.tar glibc-71d3bda9a7a15bf3f935ffcde8aeceefef8074f7.tar.gz glibc-71d3bda9a7a15bf3f935ffcde8aeceefef8074f7.tar.bz2 glibc-71d3bda9a7a15bf3f935ffcde8aeceefef8074f7.zip | |
Update.
1999-08-25 Ulrich Drepper <drepper@cygnus.com>
* inet/Makefile (routines): Add getipnodebynm.
* inet/getipnodebynm.c: New file.
* nss/digits_dots.c: If HAVE_TYPE is define type contains the
interface type.
* nss/nss_files/files-XXX.c: Define EXTRA_ARGS, EXTRA_ARGS_DECL, and
EXTRA_ARGS_VALUE is not already done.
(internal_getent): Allow extra parameters and pass them to parse_line.
(_nss_files_get,ENTNAME_r): Pass extra parameters to internal_getent.
(_nss_files_get##name##_r): Likewise.
* nss/nss_files/files-hosts.c: Define EXTRA_ARGS, EXTRA_ARGS_DECL,
and EXTRA_ARGS_VALUE to pass flags and type to parser.
Add getipnodebyname function.
* nss/nss_files/files-parse.c: Define EXTRA_ARGS, EXTRA_ARGS_DECL, and
EXTRA_ARGS_VALUE is not already done.
(parse_line): Add EXTRA_ARGS_DECL to parameter list.
* nss/nss_db/db-XXX.c (lookup): Allow extra parameters and pass them
to parse_line.
(_nss_db_get##name##_r): Pass extra parameters to lookup.
(_nss_db_get,ENTNAME_r): Likewise.
* sysdeps/generic/if_index.c (__protocol_available): New function.
* sysdeps/unix/sysv/linux/if_index.c: Likewise.
Diffstat (limited to 'nss/nss_files/files-parse.c')
| -rw-r--r-- | nss/nss_files/files-parse.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/nss/nss_files/files-parse.c b/nss/nss_files/files-parse.c index d688fdc803..41f0ef6a05 100644 --- a/nss/nss_files/files-parse.c +++ b/nss/nss_files/files-parse.c @@ -1,5 +1,5 @@ /* Common code for file-based database parsers in nss_files module. - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -33,8 +33,18 @@ NEED_H_ERRNO - defined iff an arg `int *herrnop' is used. + EXTRA_ARGS -- defined iff extra parameters must be passed to the parser + EXTRA_ARGS_DECL -- declaration for these extra parameters + EXTRA_ARGS_VALUE -- values to be passed for these parameters + Also see files-XXX.c. */ +#ifndef EXTRA_ARGS +# define EXTRA_ARGS +# define EXTRA_ARGS_DECL +# define EXTRA_ARGS_VALUE +#endif + #define CONCAT(a,b) CONCAT1(a,b) #define CONCAT1(a,b) a##b @@ -69,7 +79,8 @@ struct parser_data /* The parser is defined in a different module. */ extern int parse_line (char *line, struct STRUCTURE *result, - struct parser_data *data, size_t datalen, int *errnop); + struct parser_data *data, size_t datalen, int *errnop + EXTRA_ARGS_DECL); # define LINE_PARSER(EOLSET, BODY) /* Do nothing */ @@ -80,7 +91,8 @@ extern int parse_line (char *line, struct STRUCTURE *result, # define LINE_PARSER(EOLSET, BODY) \ parser_stclass int \ parse_line (char *line, struct STRUCTURE *result, \ - struct parser_data *data, size_t datalen, int *errnop) \ + struct parser_data *data, size_t datalen, int *errnop \ + EXTRA_ARGS_DECL) \ { \ ENTDATA_DECL (data) \ char *p = strpbrk (line, EOLSET "\n"); \ |