diff options
Diffstat (limited to 'sysvipc')
| -rw-r--r-- | sysvipc/ftok.c | 35 | ||||
| -rw-r--r-- | sysvipc/sys/ipc.h | 36 |
2 files changed, 37 insertions, 34 deletions
diff --git a/sysvipc/ftok.c b/sysvipc/ftok.c index 20d98b9d33..aaa20ee94a 100644 --- a/sysvipc/ftok.c +++ b/sysvipc/ftok.c @@ -1,29 +1,29 @@ /* Copyright (C) 1995, 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995. -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., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, 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 <sys/ipc.h> #include <sys/stat.h> key_t ftok (pathname, proj_id) - char *pathname; - char proj_id; + const char *pathname; + int proj_id; { struct stat st; key_t key; @@ -31,7 +31,8 @@ ftok (pathname, proj_id) if (__stat (pathname, &st) < 0) return (key_t) -1; - key = (st.st_ino & 0xffff) | ((st.st_dev & 0xff) << 16) | (proj_id << 24); + key = ((st.st_ino & 0xffff) | ((st.st_dev & 0xff) << 16) + | ((proj_id & 0xff) << 24)); return key; } diff --git a/sysvipc/sys/ipc.h b/sysvipc/sys/ipc.h index d459be7754..ea8f3f2132 100644 --- a/sysvipc/sys/ipc.h +++ b/sysvipc/sys/ipc.h @@ -1,24 +1,26 @@ -/* Copyright (C) 1995 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995. +/* Copyright (C) 1995, 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995. -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., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, 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. */ #ifndef _SYS_IPC_H -#define _SYS_IPC_H + +#define _SYS_IPC_H 1 +#include <sys/cdefs.h> /* Get system dependent definition of `struct ipc_perm' and more. */ #include <sys/ipc_buf.h> @@ -26,7 +28,7 @@ Boston, MA 02111-1307, USA. */ __BEGIN_DECLS /* Generates key for System V style IPC. */ -extern key_t ftok __P ((char *__pathname, char __proj_id)); +extern key_t ftok __P ((__const char *__pathname, int __proj_id)); __END_DECLS |