diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | nis/nisplus-parser.h | 19 | ||||
| -rw-r--r-- | nis/nss_nisplus/nisplus-parser.c | 11 |
3 files changed, 19 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog index 5198fa2a57..37feca2897 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-04-29 Ulrich Drepper <drepper@redhat.com> + + * nis/nss_nisplus/nisplus-parser.c: Some cleanups. Remove + hidden_def definitions. + * nis/nisplus-parser.h: Add parameter names. Remove hidden_proto + definitions. + 2006-04-28 Ulrich Drepper <drepper@redhat.com> * nis/nss_nis/nis-spwd.c (internal_nis_getspent_r): Remove data diff --git a/nis/nisplus-parser.h b/nis/nisplus-parser.h index f4b8d49596..e629119d6f 100644 --- a/nis/nisplus-parser.h +++ b/nis/nisplus-parser.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1997, 2004, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997. @@ -24,15 +24,12 @@ #include <grp.h> #include <shadow.h> -extern int _nss_nisplus_parse_pwent (nis_result *, struct passwd *, - char *, size_t, int *); -extern int _nss_nisplus_parse_grent (nis_result *, u_long, struct group *, - char *, size_t, int *); -extern int _nss_nisplus_parse_spent (nis_result *, struct spwd *, - char *, size_t, int *); - -libnss_nisplus_hidden_proto (_nss_nisplus_parse_pwent) -libnss_nisplus_hidden_proto (_nss_nisplus_parse_grent) -libnss_nisplus_hidden_proto (_nss_nisplus_parse_spent) +extern int _nss_nisplus_parse_pwent (nis_result *result, struct passwd *pw, + char *buffer, size_t buflen, int *errnop); +extern int _nss_nisplus_parse_grent (nis_result *result, u_long entry, + struct group *gr, char *buffer, + size_t buflen, int *errnop); +extern int _nss_nisplus_parse_spent (nis_result *result, struct spwd *sp, + char *buffer, size_t buflen, int *errnop); #endif diff --git a/nis/nss_nisplus/nisplus-parser.c b/nis/nss_nisplus/nisplus-parser.c index e41751fff2..4cd0738aa2 100644 --- a/nis/nss_nisplus/nisplus-parser.c +++ b/nis/nss_nisplus/nisplus-parser.c @@ -25,11 +25,11 @@ #include "nisplus-parser.h" -#define NISENTRYVAL(idx,col,res) \ - (NIS_RES_OBJECT (res)[(idx)].EN_data.en_cols.en_cols_val[(col)].ec_value.ec_value_val) +#define NISENTRYVAL(idx, col, res) \ + (NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val) -#define NISENTRYLEN(idx,col,res) \ - (NIS_RES_OBJECT (res)[(idx)].EN_data.en_cols.en_cols_val[(col)].ec_value.ec_value_len) +#define NISENTRYLEN(idx, col, res) \ + (NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len) int @@ -136,7 +136,6 @@ _nss_nisplus_parse_pwent (nis_result *result, struct passwd *pw, return 1; } -libnss_nisplus_hidden_def (_nss_nisplus_parse_pwent) int @@ -255,7 +254,6 @@ _nss_nisplus_parse_grent (nis_result *result, u_long entry, struct group *gr, return 1; } -libnss_nisplus_hidden_def (_nss_nisplus_parse_grent) int @@ -368,4 +366,3 @@ _nss_nisplus_parse_spent (nis_result *result, struct spwd *sp, return 1; } -libnss_nisplus_hidden_def (_nss_nisplus_parse_spent) |