From b2637a22dbfe8a4c790f378d339e12d78fd3f43f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 14 Jan 2004 18:41:22 +0000 Subject: Update. 2004-01-14 Ulrich Drepper * libio/libio.h: Add const to function tables types. * libio/libioP.h: Likewise. * /login/utmp-private.h: Likewise. * libio/fileops.c: Add const to jump table variable definition. * libio/genops.c: Likewise. * libio/iofopncook.c: Likewise. * libio/iopopen.c: Likewise. * libio/memstream.c: Likewise. * libio/obprintf.c: Likewise. * libio/oldfileops.c: Likewise. * libio/oldiopopen.c: Likewise. * libio/strops.c: Likewise. * libio/vsnprintf.c: Likewise. * libio/vswprintf.c: Likewise. * libio/wfileops.c: Likewise. * libio/wstrops.c: Likewise. * login/getutent_r.c: Likewise. * login/getutid_r.c Likewise. * login/getutline_r.c: Likewise. * sysdeps/generic/utmp_file.c: Likewise. --- login/getutent_r.c | 6 +++--- login/getutid_r.c | 5 +---- login/getutline_r.c | 5 +---- login/utmp-private.h | 8 ++++---- 4 files changed, 9 insertions(+), 15 deletions(-) (limited to 'login') diff --git a/login/getutent_r.c b/login/getutent_r.c index e96945e92c..76cb4cfc88 100644 --- a/login/getutent_r.c +++ b/login/getutent_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996,1997,1998,2000,2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1996-1998,2000,2001,2002,2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper and Paul Janzen , 1996. @@ -36,7 +36,7 @@ static struct utmp *pututline_unknown (const struct utmp *data); static void endutent_unknown (void); /* Initial Jump table. */ -struct utfuncs __libc_utmp_unknown_functions = +const struct utfuncs __libc_utmp_unknown_functions = { setutent_unknown, getutent_r_unknown, @@ -48,7 +48,7 @@ struct utfuncs __libc_utmp_unknown_functions = }; /* Currently selected backend. */ -struct utfuncs *__libc_utmp_jump_table = &__libc_utmp_unknown_functions; +const struct utfuncs *__libc_utmp_jump_table = &__libc_utmp_unknown_functions; /* We need to protect the opening of the file. */ __libc_lock_define_initialized (, __libc_utmp_lock attribute_hidden) diff --git a/login/getutid_r.c b/login/getutid_r.c index 03b6d2d04b..b91e843bc1 100644 --- a/login/getutid_r.c +++ b/login/getutid_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 2001, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper and Paul Janzen , 1996. @@ -29,9 +29,6 @@ /* We have to use the lock in getutent_r.c. */ __libc_lock_define (extern, __libc_utmp_lock attribute_hidden) -/* The jump table is also in getutent_r.c. */ -extern struct utfuncs *__libc_utmp_jump_table; - int __getutid_r (const struct utmp *id, struct utmp *buffer, struct utmp **result) diff --git a/login/getutline_r.c b/login/getutline_r.c index 35c510b7ac..b7d13502b5 100644 --- a/login/getutline_r.c +++ b/login/getutline_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper and Paul Janzen , 1996. @@ -28,9 +28,6 @@ /* We have to use the lock in getutent_r.c. */ __libc_lock_define (extern, __libc_utmp_lock attribute_hidden) -/* The jump table is also in getutent_r.c. */ -extern struct utfuncs *__libc_utmp_jump_table; - int __getutline_r (const struct utmp *line, struct utmp *buffer, diff --git a/login/utmp-private.h b/login/utmp-private.h index 82c84348a6..83b344150c 100644 --- a/login/utmp-private.h +++ b/login/utmp-private.h @@ -1,5 +1,5 @@ /* Internal definitions and declarations for UTMP functions. - Copyright (C) 1996, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1996, 2000, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper and Paul Janzen , 1996. @@ -38,11 +38,11 @@ struct utfuncs }; /* The tables from the services. */ -extern struct utfuncs __libc_utmp_file_functions attribute_hidden; -extern struct utfuncs __libc_utmp_unknown_functions attribute_hidden; +extern const struct utfuncs __libc_utmp_file_functions attribute_hidden; +extern const struct utfuncs __libc_utmp_unknown_functions attribute_hidden; /* Currently selected backend. */ -extern struct utfuncs *__libc_utmp_jump_table attribute_hidden; +extern const struct utfuncs *__libc_utmp_jump_table attribute_hidden; /* Current file name. */ extern const char *__libc_utmp_file_name attribute_hidden; -- cgit v1.2.3