+2003-01-19 Ulrich Drepper <drepper@redhat.com>
+
+ * nis/nss_nis/nis-spwd.c: Make _nss_nis_endspent an alias of
+ _nss_nis_setspent. Work around the different prototypes.
+ * nis/nss_nis/nis-rpc.c (internal_nis_setrpcent): Use
+ internal_nis_endrpcent.
+ (internal_nis_endrpcent): Change return type to void. Change callers.
+ * nis/nss_nis/nis-pwd.c: Make _nss_nis_endpwent an alias of
+ _nss_nis_setpwent. Work around the different prototypes.
+ * nis/nss_nis/nis-proto.c (_nss_nis_endprotoent): Split out body
+ of the function to...
+ (internal_nis_endprotoent): ... here. New function.
+ (internal_nis_setprotoent): Use internal_nis_endprotoent.
+ * nis/nss_nis/nis-network.c: Make _nss_nis_endnetent an alias of
+ _nss_nis_setnetent. Work around the different prototypes.
+ * nis/nss_nis/nis-netgrp.c (_nss_nis_endnetgrent): Split out body
+ of the function to...
+ (internal_nis_endnetgrent): ... here. New function.
+ (_nss_nis_setnetgrent): Use internal_nis_endnetgrent.
+
2003-01-19 Jim Meyering <jim@meyering.net>
* time/strftime.c: (widen): Merge nearly-identical definitions.
}
/* Make _nss_nis_endgrent an alias of _nss_nis_setgrent. We do this
even though the prototypes don't match. The argument of setgrent
- is used so this makes no difference. */
+ is not used so this makes no difference. */
strong_alias (_nss_nis_setgrent, _nss_nis_endgrent)
static enum nss_status
-/* Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1999,2000,2002,2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
_nss_netgroup_parseline (char **cursor, struct __netgrent *result,
char *buffer, size_t buflen, int *errnop);
+
+static void
+internal_nis_endnetgrent (void)
+{
+ if (data != NULL)
+ {
+ free (data);
+ data = NULL;
+ data_size = 0;
+ cursor = NULL;
+ }
+}
+
enum nss_status
_nss_nis_setnetgrent (const char *group, struct __netgrent *dummy)
{
__libc_lock_lock (lock);
- if (data != NULL)
- {
- free (data);
- data = NULL;
- data_size = 0;
- cursor = NULL;
- }
+ internal_nis_endnetgrent ();
group_len = strlen (group);
{
__libc_lock_lock (lock);
- if (data != NULL)
- {
- free (data);
- data = NULL;
- data_size = 0;
- cursor = NULL;
- }
+ internal_nis_endnetgrent ();
__libc_lock_unlock (lock);
-/* Copyright (C) 1996-2000, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996.
02111-1307 USA. */
#include <nss.h>
+/* The following is an ugly trick to avoid a prototype declaration for
+ _nss_nis_endgrent. */
+#define _nss_nis_endnetent _nss_nis_endnetent_XXX
#include <netdb.h>
+#undef _nss_nis_endnetent
#include <ctype.h>
#include <errno.h>
#include <stdint.h>
return NSS_STATUS_SUCCESS;
}
-
-enum nss_status
-_nss_nis_endnetent (void)
-{
- __libc_lock_lock (lock);
-
- new_start = 1;
- if (oldkey != NULL)
- {
- free (oldkey);
- oldkey = NULL;
- oldkeylen = 0;
- }
-
- __libc_lock_unlock (lock);
-
- return NSS_STATUS_SUCCESS;
-}
+/* Make _nss_nis_endnetent an alias of _nss_nis_setnetent. We do this
+ even though the prototypes don't match. The argument of setnetent
+ is not used so this makes no difference. */
+strong_alias (_nss_nis_setnetent, _nss_nis_endnetent)
static enum nss_status
internal_nis_getnetent_r (struct netent *net, char *buffer, size_t buflen,
-/* Copyright (C) 1996,1997,1998,2000,2001,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-1998, 2000-2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
return 0;
}
-static enum nss_status
-internal_nis_setprotoent (void)
+static void
+internal_nis_endprotoent (void)
{
- char *domainname;
- struct ypall_callback ypcb;
- enum nss_status status;
-
- yp_get_default_domain (&domainname);
-
while (start != NULL)
{
if (start->val != NULL)
start = start->next;
free (next);
}
- start = NULL;
+}
+
+static enum nss_status
+internal_nis_setprotoent (void)
+{
+ char *domainname;
+ struct ypall_callback ypcb;
+ enum nss_status status;
+
+ yp_get_default_domain (&domainname);
+
+ internal_nis_endprotoent ();
ypcb.foreach = saveit;
ypcb.data = NULL;
{
__libc_lock_lock (lock);
- while (start != NULL)
- {
- if (start->val != NULL)
- free (start->val);
- next = start;
- start = start->next;
- free (next);
- }
- start = NULL;
+ internal_nis_endprotoent ();
next = NULL;
__libc_lock_unlock (lock);
-/* Copyright (C) 1996, 1997, 1998, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-1998, 2001, 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996.
02111-1307 USA. */
#include <nss.h>
+/* The following is an ugly trick to avoid a prototype declaration for
+ _nss_nis_endpwent. */
+#define _nss_nis_endpwent _nss_nis_endpwent_XXX
#include <pwd.h>
+#undef _nss_nis_endpwent
#include <ctype.h>
#include <errno.h>
#include <string.h>
return NSS_STATUS_SUCCESS;
}
-
-enum nss_status
-_nss_nis_endpwent (void)
-{
- __libc_lock_lock (lock);
-
- new_start = 1;
- if (oldkey != NULL)
- {
- free (oldkey);
- oldkey = NULL;
- oldkeylen = 0;
- }
-
- __libc_lock_unlock (lock);
-
- return NSS_STATUS_SUCCESS;
-}
+/* Make _nss_nis_endpwent an alias of _nss_nis_setpwent. We do this
+ even though the prototypes don't match. The argument of setpwent
+ is not used so this makes no difference. */
+strong_alias (_nss_nis_setpwent, _nss_nis_endpwent)
static enum nss_status
internal_nis_getpwent_r (struct passwd *pwd, char *buffer, size_t buflen,
-/* Copyright (C) 1996, 1997, 1998, 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-1998, 2000, 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
return 0;
}
+static void
+internal_nis_endrpcent (intern_t *intern)
+{
+ while (intern->start != NULL)
+ {
+ if (intern->start->val != NULL)
+ free (intern->start->val);
+ intern->next = intern->start;
+ intern->start = intern->start->next;
+ free (intern->next);
+ }
+}
+
static enum nss_status
internal_nis_setrpcent (intern_t *intern)
{
if (yp_get_default_domain (&domainname))
return NSS_STATUS_UNAVAIL;
- while (intern->start != NULL)
- {
- if (intern->start->val != NULL)
- free (intern->start->val);
- intern->next = intern->start;
- intern->start = intern->start->next;
- free (intern->next);
- }
- intern->start = NULL;
+ internal_nis_endrpcent (intern);
ypcb.foreach = saveit;
ypcb.data = (char *)intern;
return status;
}
-static enum nss_status
-internal_nis_endrpcent (intern_t *intern)
-{
- while (intern->start != NULL)
- {
- if (intern->start->val != NULL)
- free (intern->start->val);
- intern->next = intern->start;
- intern->start = intern->start->next;
- free (intern->next);
- }
- intern->start = NULL;
-
- return NSS_STATUS_SUCCESS;
-}
-
enum nss_status
_nss_nis_endrpcent (void)
{
- enum nss_status status;
-
__libc_lock_lock (lock);
- status = internal_nis_endrpcent (&intern);
+ internal_nis_endrpcent (&intern);
__libc_lock_unlock (lock);
- return status;
+ return NSS_STATUS_SUCCESS;
}
static enum nss_status
-/* Copyright (C) 1996, 1997, 1998, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-1998, 2001, 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996.
#include <ctype.h>
#include <errno.h>
#include <string.h>
+/* The following is an ugly trick to avoid a prototype declaration for
+ _nss_nis_endspent. */
+#define _nss_nis_endspent _nss_nis_endspent_XXX
#include <shadow.h>
+#undef _nss_nis_endspent
#include <bits/libc-lock.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
__libc_lock_lock (lock);
new_start = 1;
- if (oldkey != NULL)
- {
- free (oldkey);
- oldkey = NULL;
- oldkeylen = 0;
- }
-
- __libc_lock_unlock (lock);
-
- return NSS_STATUS_SUCCESS;
-}
-
-enum nss_status
-_nss_nis_endspent (void)
-{
- __libc_lock_lock (lock);
-
- new_start = 1;
- if (oldkey != NULL)
- {
- free (oldkey);
- oldkey = NULL;
- oldkeylen = 0;
- }
+ free (oldkey);
+ oldkey = NULL;
+ oldkeylen = 0;
__libc_lock_unlock (lock);
return NSS_STATUS_SUCCESS;
}
+/* Make _nss_nis_endspent an alias of _nss_nis_setspent. We do this
+ even though the prototypes don't match. The argument of setspent
+ is not used so this makes no difference. */
+strong_alias (_nss_nis_setspent, _nss_nis_endspent)
static enum nss_status
internal_nis_getspent_r (struct spwd *sp, char *buffer, size_t buflen,
projects / thirdparty / glibc.git / commitdiff
