From 0a1063f471355de723393cb968ac9324de1d185d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 16 Dec 2002 22:17:11 +0000 Subject: Update. 2002-12-16 Ulrich Drepper * stdio-common/Makefile (routines): Remove lockfile. Add flockfile, ftrylockfile, and funlockfile. * sysdeps/generic/lockfile.c: Removed. Each function has its own file. * sysdeps/generic/flockfile.c: New file. * sysdeps/generic/ftrylockfile.c: New file. * sysdeps/generic/funlockfile.c: New file. --- sysdeps/generic/flockfile.c | 30 ++++++++++++++++++++++ sysdeps/generic/ftrylockfile.c | 31 +++++++++++++++++++++++ sysdeps/generic/funlockfile.c | 30 ++++++++++++++++++++++ sysdeps/generic/lockfile.c | 57 ------------------------------------------ 4 files changed, 91 insertions(+), 57 deletions(-) create mode 100644 sysdeps/generic/flockfile.c create mode 100644 sysdeps/generic/ftrylockfile.c create mode 100644 sysdeps/generic/funlockfile.c delete mode 100644 sysdeps/generic/lockfile.c (limited to 'sysdeps/generic') diff --git a/sysdeps/generic/flockfile.c b/sysdeps/generic/flockfile.c new file mode 100644 index 0000000000..571930ee54 --- /dev/null +++ b/sysdeps/generic/flockfile.c @@ -0,0 +1,30 @@ +/* Lock I/O stream. Singlethreaded version. + Copyright (C) 1996, 1997, 2000, 2002 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include + +#undef _IO_flockfile + +void +__flockfile (FILE *stream) +{ + /* Do nothing. Using this version does not do any locking. */ +} +weak_alias (__flockfile, flockfile); +weak_alias (__flockfile, _IO_flockfile) diff --git a/sysdeps/generic/ftrylockfile.c b/sysdeps/generic/ftrylockfile.c new file mode 100644 index 0000000000..7bd3e9b53b --- /dev/null +++ b/sysdeps/generic/ftrylockfile.c @@ -0,0 +1,31 @@ +/* Try locking I/O stream. Singlethreaded version. + Copyright (C) 1996, 1997, 2000, 2002 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include + +#undef _IO_ftrylockfile + +int +__ftrylockfile (FILE *stream) +{ + /* Do nothing. Using this version does not do any locking. */ + return 1; +} +weak_alias (__ftrylockfile, ftrylockfile); +weak_alias (__ftrylockfile, _IO_ftrylockfile) diff --git a/sysdeps/generic/funlockfile.c b/sysdeps/generic/funlockfile.c new file mode 100644 index 0000000000..902d29478d --- /dev/null +++ b/sysdeps/generic/funlockfile.c @@ -0,0 +1,30 @@ +/* Unlock I/O stream. Singlethreaded version. + Copyright (C) 1996, 1997, 2000, 2002 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include + +#undef _IO_funlockfile + +void +__funlockfile (FILE *stream) +{ + /* Do nothing. Using this version does not do any locking. */ +} +weak_alias (__funlockfile, _IO_funlockfile) +weak_alias (__funlockfile, funlockfile); diff --git a/sysdeps/generic/lockfile.c b/sysdeps/generic/lockfile.c deleted file mode 100644 index eff457c438..0000000000 --- a/sysdeps/generic/lockfile.c +++ /dev/null @@ -1,57 +0,0 @@ -/* lockfile - Handle locking and unlocking of stream. Singlethreaded version. - Copyright (C) 1996,97,2000 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 - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#include - -#undef _IO_flockfile -#undef _IO_funlockfile -#undef _IO_ftrylockfile - -void -__flockfile (FILE *stream) -{ - /* Do nothing. Using this version does not do any locking. */ -} -weak_alias (__flockfile, flockfile); -#ifdef USE_IN_LIBIO -weak_alias (__flockfile, _IO_flockfile) -#endif - - -void -__funlockfile (FILE *stream) -{ - /* Do nothing. Using this version does not do any locking. */ -} -#ifdef USE_IN_LIBIO -weak_alias (__funlockfile, _IO_funlockfile) -#endif -weak_alias (__funlockfile, funlockfile); - - -int -__ftrylockfile (FILE *stream) -{ - /* Do nothing. Using this version does not do any locking. */ - return 1; -} -weak_alias (__ftrylockfile, ftrylockfile); -#ifdef USE_IN_LIBIO -weak_alias (__ftrylockfile, _IO_ftrylockfile) -#endif -- cgit 1.4.1