diff options
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/bb_init_func.c | 43 | ||||
| -rw-r--r-- | sysdeps/generic/bcopy.c | 32 | ||||
| -rw-r--r-- | sysdeps/generic/bzero.c | 37 | ||||
| -rwxr-xr-x | sysdeps/generic/configure | 18 | ||||
| -rw-r--r-- | sysdeps/generic/div.c | 33 | ||||
| -rw-r--r-- | sysdeps/generic/ffs.c | 34 | ||||
| -rw-r--r-- | sysdeps/generic/memccpy.c | 41 | ||||
| -rw-r--r-- | sysdeps/generic/memcpy.c | 38 | ||||
| -rw-r--r-- | sysdeps/generic/memmove.c | 17 | ||||
| -rw-r--r-- | sysdeps/generic/memset.c | 36 | ||||
| -rw-r--r-- | sysdeps/generic/vfork.c | 29 | ||||
| -rw-r--r-- | sysdeps/generic/vtimes.c | 41 |
12 files changed, 201 insertions, 198 deletions
diff --git a/sysdeps/generic/bb_init_func.c b/sysdeps/generic/bb_init_func.c index 0c768c3c2d..15919fd03d 100644 --- a/sysdeps/generic/bb_init_func.c +++ b/sysdeps/generic/bb_init_func.c @@ -1,37 +1,36 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. Contributed by David Mosberger (davidm@cs.arizona.edu). -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 Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. -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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* __bb_init_func is invoked at the beginning of each function, before -any registers have been saved. This generic routine should work -provided that calling this function doesn't mangle the arguments -passed to the function being called. If that's not the case, a system -specific routine must be provided. */ + any registers have been saved. This generic routine should work + provided that calling this function doesn't mangle the arguments + passed to the function being called. If that's not the case, a + system specific routine must be provided. */ #include <sys/types.h> #include <sys/gmon.h> -#include <ansidecl.h> #include <stdlib.h> void -DEFUN(__bb_init_func, (bb), struct __bb *bb) +__bb_init_func (bb) + struct __bb *bb; { struct gmonparam *p = &_gmonparam; @@ -49,6 +48,6 @@ DEFUN(__bb_init_func, (bb), struct __bb *bb) { /* we didn't register _mcleanup yet and pc profiling doesn't seem to be active, so let's register it now: */ - atexit(_mcleanup); + atexit (_mcleanup); } } diff --git a/sysdeps/generic/bcopy.c b/sysdeps/generic/bcopy.c index 51de492877..fa0b1a2a5a 100644 --- a/sysdeps/generic/bcopy.c +++ b/sysdeps/generic/bcopy.c @@ -1,30 +1,28 @@ -/* Copyright (C) 1991, 1992 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1992, 1997 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 Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> #include <string.h> - #define memmove bcopy #define rettype void #define RETURN(s) return #define a1 src -#define a1const CONST +#define a1const const #define a2 dest #define a2const diff --git a/sysdeps/generic/bzero.c b/sysdeps/generic/bzero.c index 7ebdcfe7e3..eaa359d77e 100644 --- a/sysdeps/generic/bzero.c +++ b/sysdeps/generic/bzero.c @@ -1,33 +1,33 @@ -/* Copyright (C) 1991 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. Contributed by Torbjorn Granlund (tege@sics.se). - -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 Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> #include <string.h> #include <memcopy.h> /* Set N bytes of S to 0. */ void -DEFUN(bzero, (s, n), PTR s AND size_t len) +bzero (s, n) + void *s; + size_t len; { long int dstp = (long int) s; - CONST op_t zero = 0; + const op_t zero = 0; if (len >= 8) { @@ -78,4 +78,3 @@ DEFUN(bzero, (s, n), PTR s AND size_t len) len -= 1; } } - diff --git a/sysdeps/generic/configure b/sysdeps/generic/configure index 9dae57acb4..ddfa2cff80 100755 --- a/sysdeps/generic/configure +++ b/sysdeps/generic/configure @@ -4,20 +4,22 @@ if test -z "$inhibit_glue"; then for ac_func in psignal do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:8: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12 "configure" +#line 13 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ #include <assert.h> /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); -int main() { return 0; } -int t() { +int main() { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named @@ -30,19 +32,21 @@ $ac_func(); ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:36: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_func_$ac_func=no" fi rm -f conftest* - fi + if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'` + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h <<EOF #define $ac_tr_func 1 EOF diff --git a/sysdeps/generic/div.c b/sysdeps/generic/div.c index 51f5e35e71..d0d441341b 100644 --- a/sysdeps/generic/div.c +++ b/sysdeps/generic/div.c @@ -1,20 +1,20 @@ -/* Copyright (C) 1992 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1992, 1997 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 Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* * Copyright (c) 1990 Regents of the University of California. @@ -52,13 +52,12 @@ Cambridge, MA 02139, USA. */ * SUCH DAMAGE. */ -#include <ansidecl.h> #include <stdlib.h> - /* Return the `div_t' representation of NUMER over DENOM. */ div_t -DEFUN(div, (numer, denom), int numer AND int denom) +div (numer, denom) + int numer, denom; { div_t result; diff --git a/sysdeps/generic/ffs.c b/sysdeps/generic/ffs.c index 18239cbecb..8e1c699f51 100644 --- a/sysdeps/generic/ffs.c +++ b/sysdeps/generic/ffs.c @@ -1,33 +1,33 @@ -/* Copyright (C) 1991, 1992 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. Contributed by Torbjorn Granlund (tege@sics.se). -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> #include <limits.h> #include <string.h> #undef ffs - /* Find the first bit set in I. */ int -DEFUN(ffs, (i), int i) +ffs (i) + int i; { - static CONST unsigned char table[] = + static const unsigned char table[] = { 0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, diff --git a/sysdeps/generic/memccpy.c b/sysdeps/generic/memccpy.c index b905952527..8875abedd5 100644 --- a/sysdeps/generic/memccpy.c +++ b/sysdeps/generic/memccpy.c @@ -1,37 +1,36 @@ -/* Copyright (C) 1991, 1995 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1995, 1997 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 Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> #include <stddef.h> /* For size_t and NULL. */ - /* * Copy no more than N bytes of SRC to DEST, stopping when C is found. * Return the position in DEST one byte past where C was copied, * or NULL if C was not found in the first N bytes of SRC. */ -PTR -DEFUN(__memccpy, (dest, src, c, n), - PTR dest AND CONST PTR src AND int c AND size_t n) +void * +__memccpy (dest, src, c, n) + void *dest; const void *src; + int c; size_t n; { - register CONST char *s = src; + register const char *s = src; register char *d = dest; - register CONST int x = (unsigned char) c; + register const int x = (unsigned char) c; register size_t i = n; while (i-- > 0) diff --git a/sysdeps/generic/memcpy.c b/sysdeps/generic/memcpy.c index e1a1ade057..05fa043fa5 100644 --- a/sysdeps/generic/memcpy.c +++ b/sysdeps/generic/memcpy.c @@ -1,31 +1,33 @@ -/* memcpy -- copy memory to memory until the specified number of bytes +/* Copy memory to memory until the specified number of bytes has been copied. Overlap is NOT handled correctly. - Copyright (C) 1991 Free Software Foundation, Inc. + Copyright (C) 1991, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. Contributed by Torbjorn Granlund (tege@sics.se). -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> #include <string.h> #include <memcopy.h> #include <pagecopy.h> -PTR -DEFUN(memcpy, (dstpp, srcpp, len), - PTR dstpp AND CONST PTR srcpp AND size_t len) +void * +memcpy (dstpp, srcpp, len) + void *dstpp; + const void *srcpp; + size_t len; { unsigned long int dstp = (long int) dstpp; unsigned long int srcp = (long int) srcpp; diff --git a/sysdeps/generic/memmove.c b/sysdeps/generic/memmove.c index fa9cb2a1a4..f4a900973d 100644 --- a/sysdeps/generic/memmove.c +++ b/sysdeps/generic/memmove.c @@ -1,6 +1,6 @@ -/* memmove -- copy memory to memory until the specified number of bytes +/* Copy memory to memory until the specified number of bytes has been copied. Overlap is handled correctly. - Copyright (C) 1991, 1995, 1996 Free Software Foundation, Inc. + Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. Contributed by Torbjorn Granlund (tege@sics.se). The GNU C Library is free software; you can redistribute it and/or @@ -18,7 +18,6 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> #include <string.h> #include <memcopy.h> #include <pagecopy.h> @@ -29,16 +28,18 @@ #define a1 dest /* First arg is DEST. */ #define a1const #define a2 src /* Second arg is SRC. */ -#define a2const CONST +#define a2const const #endif #if !defined(RETURN) || !defined(rettype) #define RETURN(s) return (s) /* Return DEST. */ -#define rettype PTR +#define rettype void * #endif rettype -DEFUN(memmove, (a1, a2, len), - a1const PTR a1 AND a2const PTR a2 AND size_t len) +memmove (a1, a2, len) + a1const void *a1; + a2const void *a2; + size_t len; { unsigned long int dstp = (long int) dest; unsigned long int srcp = (long int) src; @@ -101,5 +102,5 @@ DEFUN(memmove, (a1, a2, len), BYTE_COPY_BWD (dstp, srcp, len); } - RETURN(dest); + RETURN (dest); } diff --git a/sysdeps/generic/memset.c b/sysdeps/generic/memset.c index 6dee4e279e..7aeac0abec 100644 --- a/sysdeps/generic/memset.c +++ b/sysdeps/generic/memset.c @@ -1,27 +1,29 @@ -/* Copyright (C) 1991 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1997 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 Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> #include <string.h> #include <memcopy.h> -PTR -DEFUN(memset, (dstpp, c, len), PTR dstpp AND int c AND size_t len) +void * +memset (dstpp, c, len) + void *dstpp; + int c; + size_t len; { long int dstp = (long int) dstpp; diff --git a/sysdeps/generic/vfork.c b/sysdeps/generic/vfork.c index f5d2e840bf..624f784d37 100644 --- a/sysdeps/generic/vfork.c +++ b/sysdeps/generic/vfork.c @@ -1,22 +1,21 @@ -/* Copyright (C) 1992, 1995 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1992, 1995, 1997 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 Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> #include <errno.h> #include <unistd.h> diff --git a/sysdeps/generic/vtimes.c b/sysdeps/generic/vtimes.c index faa053ff79..298f428b71 100644 --- a/sysdeps/generic/vtimes.c +++ b/sysdeps/generic/vtimes.c @@ -1,22 +1,21 @@ -/* Copyright (C) 1991 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1997 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 Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> #include <stddef.h> #include <sys/vtimes.h> #include <sys/resource.h> @@ -30,14 +29,15 @@ Cambridge, MA 02139, USA. */ /* If VT is not NULL, write statistics for WHO into *VT. Return 0 for success, -1 for failure. */ static int -DEFUN(vtimes_one, (vt, who), - struct vtimes *vt AND enum __rusage_who who) +vtimes_one (vt, who) + struct vtimes *vt; + enum __rusage_who who; { if (vt != NULL) { struct rusage usage; - if (getrusage(who, &usage) < 0) + if (getrusage (who, &usage) < 0) return -1; vt->vm_utime = TIMEVAL_TO_VTIMES(usage.ru_utime); @@ -56,8 +56,9 @@ DEFUN(vtimes_one, (vt, who), *CURRENT. If CHILD is not NULL, write statistics for all terminated child processes into *CHILD. Returns 0 for success, -1 for failure. */ int -DEFUN(vtimes, (current, child), - struct vtimes *current AND struct vtimes *child) +vtimes (current, child) + struct vtimes *current; + struct vtimes *child; { if (vtimes_one(current, RUSAGE_SELF) < 0 || vtimes_one(child, RUSAGE_CHILDREN) < 0) |