From ffd477e45c28fc565ef481bccdf0a7779ace9c26 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Thu, 2 Jan 2003 03:55:53 +0000 Subject: [PATCH] do not declare errno as this breaks with glibc --- debian/patch.errno | 635 ++++++++++++++++++++++++++++++++++++ src/afsmonitor/afsmonitor.c | 4 +- src/butm/butm_test.c | 5 +- src/export/cfgafs.c | 5 +- src/export/cfgexport.c | 4 +- src/gtx/curseswindows.c | 4 +- src/gtx/dumbwindows.c | 6 +- src/gtx/object_test.c | 4 +- src/gtx/screen_test.c | 4 +- src/package/fileops.c | 9 +- src/package/messages.c | 3 +- src/pinstall/install.c | 3 +- src/ptserver/db_verify.c | 3 +- src/ptserver/pt_util.c | 6 +- src/scout/scout.c | 5 +- src/sys/afssyscalls.c | 13 +- src/sys/rmtsysd.c | 5 +- src/sys/rmtsyss.c | 4 +- src/uss/uss_fs.c | 5 +- src/uss/uss_kauth.c | 3 +- src/uss/uss_procs.c | 3 +- src/uss/uss_ptserver.c | 3 +- src/uss/uss_vol.c | 5 +- src/venus/fs.c | 4 +- src/venus/kdump.c | 64 +++- src/venus/twiddle.c | 7 +- src/vlserver/cnvldb.c | 4 +- src/vlserver/sascnvldb.c | 4 +- src/vol/fs_conv_411.c | 3 +- src/vol/partition.c | 5 +- 30 files changed, 756 insertions(+), 76 deletions(-) create mode 100644 debian/patch.errno diff --git a/debian/patch.errno b/debian/patch.errno new file mode 100644 index 000000000..6bf80bc23 --- /dev/null +++ b/debian/patch.errno @@ -0,0 +1,635 @@ +? src/tests/run-tests +? src/tests/OpenAFS/Dirpath.pm +Index: src/afsmonitor/afsmonitor.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/afsmonitor/afsmonitor.c,v +retrieving revision 1.1.1.8 +diff -u -r1.1.1.8 afsmonitor.c +--- src/afsmonitor/afsmonitor.c 26 Sep 2002 19:04:39 -0000 1.1.1.8 ++++ src/afsmonitor/afsmonitor.c 2 Jan 2003 03:50:48 -0000 +@@ -209,7 +209,7 @@ + /* EXTERN DEFINITIONS */ + + extern struct hostent *hostutil_GetHostByName(); +-extern int errno; ++ + + + /* routines from afsmon-output.c */ +Index: src/butm/butm_test.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/butm/butm_test.c,v +retrieving revision 1.1.1.7 +diff -u -r1.1.1.7 butm_test.c +--- src/butm/butm_test.c 14 Oct 2001 18:04:19 -0000 1.1.1.7 ++++ src/butm/butm_test.c 2 Jan 2003 03:50:50 -0000 +@@ -12,6 +12,7 @@ + + RCSID("$Header: /tmp/cvstemp/openafs/debian/Attic/patch.errno,v 1.1 2003/01/02 03:55:49 hartmans Exp $"); + ++#include + #include + #include + #include +@@ -23,7 +24,7 @@ + #include + #include "AFS_component_version_number.c" + +-extern int errno; ++ + + static char *whoami = "TEST FAIL"; + +Index: src/export/cfgafs.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/export/cfgafs.c,v +retrieving revision 1.1.1.4 +diff -u -r1.1.1.4 cfgafs.c +--- src/export/cfgafs.c 14 Jul 2001 22:21:52 -0000 1.1.1.4 ++++ src/export/cfgafs.c 2 Jan 2003 03:50:52 -0000 +@@ -15,6 +15,7 @@ + + RCSID("$Header: /tmp/cvstemp/openafs/debian/Attic/patch.errno,v 1.1 2003/01/02 03:55:49 hartmans Exp $"); + ++#include + #include + #include + #include +@@ -26,7 +27,7 @@ + #include + + extern char *malloc(), *optarg; +-extern int errno; ++ + extern int sysconfig(int cmd, void *arg, int len); + + #include "AFS_component_version_number.c" +Index: src/export/cfgexport.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/export/cfgexport.c,v +retrieving revision 1.1.1.5 +diff -u -r1.1.1.5 cfgexport.c +--- src/export/cfgexport.c 11 Sep 2001 14:32:37 -0000 1.1.1.5 ++++ src/export/cfgexport.c 2 Jan 2003 03:50:52 -0000 +@@ -15,6 +15,7 @@ + + RCSID("$Header: /tmp/cvstemp/openafs/debian/Attic/patch.errno,v 1.1 2003/01/02 03:55:49 hartmans Exp $"); + ++#include + #include + #include + #include +@@ -29,7 +30,6 @@ + #include "sym.h" + + extern char *malloc(), *optarg; +-extern int errno; + extern int sysconfig(int cmd, void *arg, int len); + + int debug; +Index: src/gtx/curseswindows.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/gtx/curseswindows.c,v +retrieving revision 1.1.1.6 +diff -u -r1.1.1.6 curseswindows.c +--- src/gtx/curseswindows.c 26 Sep 2002 19:06:06 -0000 1.1.1.6 ++++ src/gtx/curseswindows.c 2 Jan 2003 03:50:52 -0000 +@@ -41,7 +41,7 @@ + #include "gtxobjects.h" + #include "gtxframe.h" + +-extern int errno; /* everybody else puts it in errno.h */ ++ + + int curses_debug; /*Is debugging turned on?*/ + static char mn[] = "gator_curseswindows"; /*Module name*/ +Index: src/gtx/dumbwindows.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/gtx/dumbwindows.c,v +retrieving revision 1.1.1.4 +diff -u -r1.1.1.4 dumbwindows.c +--- src/gtx/dumbwindows.c 14 Jul 2001 22:22:01 -0000 1.1.1.4 ++++ src/gtx/dumbwindows.c 2 Jan 2003 03:50:52 -0000 +@@ -20,10 +20,8 @@ + + #include "gtxdumbwin.h" /*Interface definition*/ + #include /*Standard I/O package*/ ++#include + +-#if !defined(NeXT) +-extern int errno; /*System error number*/ +-#endif /* NeXT */ + int dumb_debug; /*Is debugging turned on?*/ + static char mn[] = "gator_dumbwindows"; /*Module name*/ + +Index: src/gtx/object_test.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/gtx/object_test.c,v +retrieving revision 1.1.1.4 +diff -u -r1.1.1.4 object_test.c +--- src/gtx/object_test.c 14 Jul 2001 22:22:03 -0000 1.1.1.4 ++++ src/gtx/object_test.c 2 Jan 2003 03:50:52 -0000 +@@ -23,10 +23,10 @@ + #include "gtxcurseswin.h" /*Gator curses window package*/ + #include "gtxdumbwin.h" /*Gator dumb terminal window package*/ + #include "gtxX11win.h" /*Gator X11 window package*/ ++#include + #include /*Standard I/O stuff*/ + #include /*Command interpretation library*/ + +-extern int errno; + + /* + * Command line parameter indicies. +Index: src/gtx/screen_test.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/gtx/screen_test.c,v +retrieving revision 1.1.1.4 +diff -u -r1.1.1.4 screen_test.c +--- src/gtx/screen_test.c 14 Jul 2001 22:22:04 -0000 1.1.1.4 ++++ src/gtx/screen_test.c 2 Jan 2003 03:50:52 -0000 +@@ -21,8 +21,8 @@ + #include "gtxdumbwin.h" /*Dumb terminal window interface*/ + #include "gtxX11win.h" /*X11 window interface*/ + #include /*Command interpretation library*/ ++#include + +-extern int errno; + + /* + * Command line parameter indicies. +Index: src/package/fileops.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/package/fileops.c,v +retrieving revision 1.1.1.1 +diff -u -r1.1.1.1 fileops.c +--- src/package/fileops.c 4 Nov 2000 04:23:23 -0000 1.1.1.1 ++++ src/package/fileops.c 2 Jan 2003 03:50:57 -0000 +@@ -27,6 +27,13 @@ + #include + #include + #include ++#ifdef HAVE_STRING_H ++#include ++#else ++#ifdef HAVE_STRINGS_H ++#include ++#endif ++#endif + #include + #ifdef AFS_SUN5_ENV + #include +@@ -34,8 +41,6 @@ + #include "globals.h" + #include "package.h" + +-extern char *strcpy(); +-extern int errno; + + int mv(from,to) + register char *from; +Index: src/package/messages.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/package/messages.c,v +retrieving revision 1.1.1.1 +diff -u -r1.1.1.1 messages.c +--- src/package/messages.c 4 Nov 2000 04:23:24 -0000 1.1.1.1 ++++ src/package/messages.c 2 Jan 2003 03:50:57 -0000 +@@ -29,6 +29,8 @@ + #endif + #include + #include "package.h" ++#include ++ + + static char *putnum(dp, n, b) + register char *dp; +@@ -98,7 +100,6 @@ + } + case 'm': + { +- extern int errno; + extern int sys_nerr; + extern char *sys_errlist[]; + +Index: src/pinstall/install.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/pinstall/install.c,v +retrieving revision 1.1.1.9 +diff -u -r1.1.1.9 install.c +--- src/pinstall/install.c 26 Sep 2002 19:07:22 -0000 1.1.1.9 ++++ src/pinstall/install.c 2 Jan 2003 03:50:58 -0000 +@@ -85,7 +85,6 @@ + + struct stat istat, ostat; + +-extern int errno; + #if !defined(AFS_DARWIN60_ENV) + extern int sys_nerr; + #endif +Index: src/ptserver/db_verify.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/ptserver/db_verify.c,v +retrieving revision 1.1.1.8 +diff -u -r1.1.1.8 db_verify.c +--- src/ptserver/db_verify.c 14 Oct 2001 18:06:10 -0000 1.1.1.8 ++++ src/ptserver/db_verify.c 2 Jan 2003 03:50:58 -0000 +@@ -7,7 +7,6 @@ + * directory or online at http://www.openafs.org/dl/license10.html + */ + +-extern int errno; + + #include + #include +Index: src/ptserver/pt_util.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/ptserver/pt_util.c,v +retrieving revision 1.5 +diff -u -r1.5 pt_util.c +--- src/ptserver/pt_util.c 20 Sep 2001 06:47:46 -0000 1.5 ++++ src/ptserver/pt_util.c 2 Jan 2003 03:50:58 -0000 +@@ -23,6 +23,7 @@ + + RCSID("$Header: /tmp/cvstemp/openafs/debian/Attic/patch.errno,v 1.1 2003/01/02 03:55:49 hartmans Exp $"); + ++#include + #include + #include + #define UBIK_INTERNALS +@@ -39,7 +40,6 @@ + + extern char *optarg; + extern int optind; +-extern int errno; + + int display_entry(); + void add_group(); +Index: src/scout/scout.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/scout/scout.c,v +retrieving revision 1.1.1.5 +diff -u -r1.1.1.5 scout.c +--- src/scout/scout.c 11 Sep 2001 14:34:47 -0000 1.1.1.5 ++++ src/scout/scout.c 2 Jan 2003 03:51:01 -0000 +@@ -32,8 +32,9 @@ + #include /*Standard I/O stuff*/ + #include /*Command interpretation library*/ + #include /*Interface for fsprobe module*/ ++#include ++ + +-extern int errno; + extern struct hostent *hostutil_GetHostByName(); + extern int gtx_InputServer(); + extern int gethostname(); +Index: src/sys/afssyscalls.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/sys/afssyscalls.c,v +retrieving revision 1.1.1.4 +diff -u -r1.1.1.4 afssyscalls.c +--- src/sys/afssyscalls.c 14 Jul 2001 22:23:58 -0000 1.1.1.4 ++++ src/sys/afssyscalls.c 2 Jan 2003 03:51:01 -0000 +@@ -27,6 +27,7 @@ + #ifdef AFS_SGI_XFS_IOPS_ENV + #include "xfsattrs.h" + #endif ++#include + #include "afssyscalls.h" + + #ifdef AFS_DEBUG_IOPS +@@ -238,8 +239,7 @@ + icreate(dev, near_inode, param1, param2, param3, param4) + int dev, near_inode, param1, param2, param3, param4; + { +- extern int errno; +- int errcode; ++ int errcode; + struct iparam iparams; + + iparams.param1 = param1; +@@ -255,7 +255,6 @@ + iopen(dev, inode, usrmod) + int dev, inode, usrmod; + { +- extern int errno; + int errcode; + + errcode = syscall(AFS_SYSCALL, AFSCALL_IOPEN, dev, inode, usrmod); +@@ -266,7 +265,6 @@ + iinc(dev, inode, inode_p1) + int dev, inode, inode_p1; + { +- extern int errno; + int errcode; + + errcode = syscall(AFS_SYSCALL, AFSCALL_IINC, dev, inode, inode_p1); +@@ -277,7 +275,6 @@ + idec(dev, inode, inode_p1) + int dev, inode, inode_p1; + { +- extern int errno; + int errcode; + + errcode = syscall(AFS_SYSCALL, AFSCALL_IDEC, dev, inode, inode_p1); +@@ -292,7 +289,6 @@ + char *cbuf; + unsigned int count; + { +- extern int errno; + int errcode; + struct iparam iparams; + +@@ -311,7 +307,6 @@ + char *cbuf; + unsigned int count; + { +- extern int errno; + int errcode; + struct iparam iparams; + +@@ -329,7 +324,6 @@ + + lsetpag() + { +- extern int errno; + int errcode; + + errcode = syscall(AFS_SYSCALL, AFSCALL_SETPAG); +@@ -340,7 +334,6 @@ + char *path, *cmarg; + int cmd, follow; + { +- extern int errno; + int errcode; + + errcode = syscall(AFS_SYSCALL, AFSCALL_PIOCTL, path, cmd, cmarg, follow); +Index: src/sys/rmtsysd.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/sys/rmtsysd.c,v +retrieving revision 1.1.1.4 +diff -u -r1.1.1.4 rmtsysd.c +--- src/sys/rmtsysd.c 14 Jul 2001 22:24:04 -0000 1.1.1.4 ++++ src/sys/rmtsysd.c 2 Jan 2003 03:51:01 -0000 +@@ -28,11 +28,12 @@ + #include + #include + #include ++#include + #include + #include + #include "rmtsys.h" + +-extern int errno; /* We ship this over the net if needed */ ++ + extern RMTSYS_ExecuteRequest(); + + #define N_SECURITY_OBJECTS 1 /* No real security yet */ +Index: src/sys/rmtsyss.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/sys/rmtsyss.c,v +retrieving revision 1.1.1.6 +diff -u -r1.1.1.6 rmtsyss.c +--- src/sys/rmtsyss.c 11 Sep 2001 14:34:52 -0000 1.1.1.6 ++++ src/sys/rmtsyss.c 2 Jan 2003 03:51:01 -0000 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + #include + #ifdef HAVE_STRING_H +@@ -33,7 +34,6 @@ + /*#include */ + #include "rmtsys.h" + +-extern int errno; /* We ship this over the net if needed */ + extern RMTSYS_ExecuteRequest(); + + #define NFS_EXPORTER 1 /* To probably handle more later */ +Index: src/uss/uss_fs.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/uss/uss_fs.c,v +retrieving revision 1.1.1.5 +diff -u -r1.1.1.5 uss_fs.c +--- src/uss/uss_fs.c 11 Sep 2001 14:35:06 -0000 1.1.1.5 ++++ src/uss/uss_fs.c 2 Jan 2003 03:51:03 -0000 +@@ -28,10 +28,11 @@ + #ifdef AFS_SUN5_ENV + #include + #endif ++#include + #include + #include + #include "uss_common.h" +-extern int errno; ++ + + + /* +Index: src/uss/uss_kauth.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/uss/uss_kauth.c,v +retrieving revision 1.1.1.5 +diff -u -r1.1.1.5 uss_kauth.c +--- src/uss/uss_kauth.c 11 Sep 2001 14:35:06 -0000 1.1.1.5 ++++ src/uss/uss_kauth.c 2 Jan 2003 03:51:03 -0000 +@@ -28,7 +28,6 @@ + #include /*MAXKTCREALMLEN*/ + #include /* pack_long */ + +-extern int errno; + extern afs_int32 KAM_CreateUser(); + + #define uss_kauth_MAX_SIZE 2048 +Index: src/uss/uss_procs.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/uss/uss_procs.c,v +retrieving revision 1.1.1.5 +diff -u -r1.1.1.5 uss_procs.c +--- src/uss/uss_procs.c 11 Sep 2001 14:35:06 -0000 1.1.1.5 ++++ src/uss/uss_procs.c 2 Jan 2003 03:51:03 -0000 +@@ -33,7 +33,6 @@ + #endif + #include /*MAXKTCREALMLEN*/ + +-extern int errno; + + #undef USS_PROCS_DB + #undef USS_PROCS_DB_INSTANCE +Index: src/uss/uss_ptserver.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/uss/uss_ptserver.c,v +retrieving revision 1.1.1.5 +diff -u -r1.1.1.5 uss_ptserver.c +--- src/uss/uss_ptserver.c 11 Sep 2001 14:35:07 -0000 1.1.1.5 ++++ src/uss/uss_ptserver.c 2 Jan 2003 03:51:03 -0000 +@@ -25,7 +25,6 @@ + #include /*Protection Server error codes*/ + #include /*Error code xlation*/ + +-extern int errno; + + #undef USS_PTSERVER_DB + +Index: src/uss/uss_vol.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/uss/uss_vol.c,v +retrieving revision 1.1.1.6 +diff -u -r1.1.1.6 uss_vol.c +--- src/uss/uss_vol.c 26 Sep 2002 19:08:53 -0000 1.1.1.6 ++++ src/uss/uss_vol.c 2 Jan 2003 03:51:03 -0000 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +@@ -38,7 +38,6 @@ + #include + #include + +-extern int errno; + extern struct rx_connection *UV_Bind(); + extern struct rx_securityClass *rxnull_NewClientSecurityObject(); + extern int line; +Index: src/venus/fs.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/venus/fs.c,v +retrieving revision 1.1.1.10 +diff -u -r1.1.1.10 fs.c +--- src/venus/fs.c 26 Sep 2002 19:09:04 -0000 1.1.1.10 ++++ src/venus/fs.c 2 Jan 2003 03:51:04 -0000 +@@ -66,7 +66,7 @@ + extern struct hostent *hostutil_GetHostByName(); + extern afs_int32 VL_GetEntryByNameO(); + +-extern int errno; ++ + extern struct cmd_syndesc *cmd_CreateSyntax(); + static char pn[] = "fs"; + static int rxInitDone = 0; +Index: src/venus/kdump.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/venus/kdump.c,v +retrieving revision 1.1.1.11 +diff -u -r1.1.1.11 kdump.c +--- src/venus/kdump.c 2 Aug 2002 04:37:28 -0000 1.1.1.11 ++++ src/venus/kdump.c 2 Jan 2003 03:51:04 -0000 +@@ -13,6 +13,7 @@ + RCSID("$Header: /tmp/cvstemp/openafs/debian/Attic/patch.errno,v 1.1 2003/01/02 03:55:49 hartmans Exp $"); + + #include ++#include + #include /* for malloc() */ + + #ifdef AFS_LINUX24_ENV +@@ -518,7 +519,6 @@ + #ifndef AFS_KDUMP_LIB + extern struct cmd_syndesc *cmd_CreateSyntax(); + #endif +-extern int errno; + int opencore(); + + /* Note: this should agree with the definition in afs_buffer.c */ +Index: src/venus/twiddle.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/venus/twiddle.c,v +retrieving revision 1.1.1.4 +diff -u -r1.1.1.4 twiddle.c +--- src/venus/twiddle.c 14 Jul 2001 22:24:37 -0000 1.1.1.4 ++++ src/venus/twiddle.c 2 Jan 2003 03:51:04 -0000 +@@ -30,7 +30,8 @@ + #undef VICE + #include "afs/prs_fs.h" + #include +-#include ++#include > ++#include + #include + #include +@@ -44,7 +45,7 @@ + static char tspace[1024]; + static struct ubik_client *uclient; + +-extern int errno; ++ + extern struct cmd_syndesc *cmd_CreateSyntax(); + static char pn[] = "fs"; + static int rxInitDone = 0; +Index: src/vlserver/cnvldb.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/vlserver/cnvldb.c,v +retrieving revision 1.1.1.5 +diff -u -r1.1.1.5 cnvldb.c +--- src/vlserver/cnvldb.c 11 Sep 2001 14:35:37 -0000 1.1.1.5 ++++ src/vlserver/cnvldb.c 2 Jan 2003 03:51:04 -0000 +@@ -30,7 +30,7 @@ + #define MAXSIZE 2048 /* most I'll get back from PIOCTL */ + #define BADSERVERID 255 /* XXX */ + +-extern int errno; ++ + extern struct cmd_syndesc *cmd_CreateSyntax(); + static char pn[] = "cnvldb"; + static char tempname[] = "XXnewvldb"; +Index: src/vlserver/sascnvldb.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/vlserver/sascnvldb.c,v +retrieving revision 1.1.1.5 +diff -u -r1.1.1.5 sascnvldb.c +--- src/vlserver/sascnvldb.c 11 Sep 2001 14:35:37 -0000 1.1.1.5 ++++ src/vlserver/sascnvldb.c 2 Jan 2003 03:51:04 -0000 +@@ -35,7 +35,7 @@ + + #define MAXSIZE 2048 /* most I'll get back from PIOCTL */ + +-extern int errno; ++ + extern struct cmd_syndesc *cmd_CreateSyntax(); + static char pn[] = "cnvldb"; + static char tempname[] = "XXnewvldb"; +Index: src/vol/fs_conv_411.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/vol/fs_conv_411.c,v +retrieving revision 1.1.1.5 +diff -u -r1.1.1.5 fs_conv_411.c +--- src/vol/fs_conv_411.c 11 Sep 2001 14:35:41 -0000 1.1.1.5 ++++ src/vol/fs_conv_411.c 2 Jan 2003 03:51:04 -0000 +@@ -84,7 +84,6 @@ + int icount=0, iarraysize=0, *iarray; + + char *rawname(), *unrawname(), *vol_DevName(), *blockcheck(); +-extern int errno; + #define ROOTINODE 2 + int force = 0, verbose = 0, unconv = 0; + +Index: src/vol/partition.c +=================================================================== +RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/vol/partition.c,v +retrieving revision 1.12 +diff -u -r1.12 partition.c +--- src/vol/partition.c 26 Sep 2002 19:18:09 -0000 1.12 ++++ src/vol/partition.c 2 Jan 2003 03:51:04 -0000 +@@ -59,7 +59,7 @@ + #endif + #endif /* AFS_VFSINCL_ENV */ + #endif /* AFS_OSF_ENV */ +-#include ++#include + #include + #include + #include +@@ -811,7 +811,6 @@ + #else + void VSetPartitionDiskUsage_r(register struct DiskPartition *dp) + { +- extern int errno; + int fd, totalblks, free, used, availblks, bsize, code; + int reserved; + #if AFS_HAVE_STATVFS diff --git a/src/afsmonitor/afsmonitor.c b/src/afsmonitor/afsmonitor.c index 74d4309eb..948c3b304 100644 --- a/src/afsmonitor/afsmonitor.c +++ b/src/afsmonitor/afsmonitor.c @@ -16,7 +16,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/afsmonitor/afsmonitor.c,v 1.1.1.8 2002/09/26 19:04:39 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afsmonitor/afsmonitor.c,v 1.2 2003/01/02 03:55:49 hartmans Exp $"); #include #include @@ -209,7 +209,7 @@ struct cm_Display_Data *prev_cmData = (struct cm_Display_Data *)0; /* EXTERN DEFINITIONS */ extern struct hostent *hostutil_GetHostByName(); -extern int errno; + /* routines from afsmon-output.c */ diff --git a/src/butm/butm_test.c b/src/butm/butm_test.c index 309cbda20..f51438be3 100644 --- a/src/butm/butm_test.c +++ b/src/butm/butm_test.c @@ -10,8 +10,9 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/butm/butm_test.c,v 1.1.1.7 2001/10/14 18:04:19 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/butm/butm_test.c,v 1.2 2003/01/02 03:55:50 hartmans Exp $"); +#include #include #include #include @@ -23,7 +24,7 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/butm/butm_test.c,v 1.1.1.7 2001/10/14 1 #include #include "AFS_component_version_number.c" -extern int errno; + static char *whoami = "TEST FAIL"; diff --git a/src/export/cfgafs.c b/src/export/cfgafs.c index e70385f87..9ca22e20b 100644 --- a/src/export/cfgafs.c +++ b/src/export/cfgafs.c @@ -13,8 +13,9 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/export/cfgafs.c,v 1.1.1.4 2001/07/14 22:21:52 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/export/cfgafs.c,v 1.2 2003/01/02 03:55:50 hartmans Exp $"); +#include #include #include #include @@ -26,7 +27,7 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/export/cfgafs.c,v 1.1.1.4 2001/07/14 22 #include extern char *malloc(), *optarg; -extern int errno; + extern int sysconfig(int cmd, void *arg, int len); #include "AFS_component_version_number.c" diff --git a/src/export/cfgexport.c b/src/export/cfgexport.c index 69fae5860..ebeb12796 100644 --- a/src/export/cfgexport.c +++ b/src/export/cfgexport.c @@ -13,8 +13,9 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/export/cfgexport.c,v 1.1.1.5 2001/09/11 14:32:37 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/export/cfgexport.c,v 1.2 2003/01/02 03:55:50 hartmans Exp $"); +#include #include #include #include @@ -29,7 +30,6 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/export/cfgexport.c,v 1.1.1.5 2001/09/11 #include "sym.h" extern char *malloc(), *optarg; -extern int errno; extern int sysconfig(int cmd, void *arg, int len); int debug; diff --git a/src/gtx/curseswindows.c b/src/gtx/curseswindows.c index 020e5bafb..c54abc46e 100644 --- a/src/gtx/curseswindows.c +++ b/src/gtx/curseswindows.c @@ -18,7 +18,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/gtx/curseswindows.c,v 1.1.1.6 2002/09/26 19:06:06 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/gtx/curseswindows.c,v 1.2 2003/01/02 03:55:50 hartmans Exp $"); #if defined(AFS_HPUX110_ENV) && !defined(__HP_CURSES) @@ -41,7 +41,7 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/gtx/curseswindows.c,v 1.1.1.6 2002/09/2 #include "gtxobjects.h" #include "gtxframe.h" -extern int errno; /* everybody else puts it in errno.h */ + int curses_debug; /*Is debugging turned on?*/ static char mn[] = "gator_curseswindows"; /*Module name*/ diff --git a/src/gtx/dumbwindows.c b/src/gtx/dumbwindows.c index 30ef8d754..29f0943f7 100644 --- a/src/gtx/dumbwindows.c +++ b/src/gtx/dumbwindows.c @@ -16,14 +16,12 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/gtx/dumbwindows.c,v 1.1.1.4 2001/07/14 22:22:01 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/gtx/dumbwindows.c,v 1.2 2003/01/02 03:55:50 hartmans Exp $"); #include "gtxdumbwin.h" /*Interface definition*/ #include /*Standard I/O package*/ +#include -#if !defined(NeXT) -extern int errno; /*System error number*/ -#endif /* NeXT */ int dumb_debug; /*Is debugging turned on?*/ static char mn[] = "gator_dumbwindows"; /*Module name*/ diff --git a/src/gtx/object_test.c b/src/gtx/object_test.c index 43cc94c53..4db38766d 100644 --- a/src/gtx/object_test.c +++ b/src/gtx/object_test.c @@ -14,7 +14,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/gtx/object_test.c,v 1.1.1.4 2001/07/14 22:22:03 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/gtx/object_test.c,v 1.2 2003/01/02 03:55:50 hartmans Exp $"); #include "gtxscreenobj.h" /*Gator screen object interface*/ #include "gtxtextobj.h" /*Gator text object interface*/ @@ -23,10 +23,10 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/gtx/object_test.c,v 1.1.1.4 2001/07/14 #include "gtxcurseswin.h" /*Gator curses window package*/ #include "gtxdumbwin.h" /*Gator dumb terminal window package*/ #include "gtxX11win.h" /*Gator X11 window package*/ +#include #include /*Standard I/O stuff*/ #include /*Command interpretation library*/ -extern int errno; /* * Command line parameter indicies. diff --git a/src/gtx/screen_test.c b/src/gtx/screen_test.c index 5066ca464..f576bd143 100644 --- a/src/gtx/screen_test.c +++ b/src/gtx/screen_test.c @@ -14,15 +14,15 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/gtx/screen_test.c,v 1.1.1.4 2001/07/14 22:22:04 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/gtx/screen_test.c,v 1.2 2003/01/02 03:55:50 hartmans Exp $"); #include "gtxwindows.h" /*Generalized window interface*/ #include "gtxcurseswin.h" /*Curses window interface*/ #include "gtxdumbwin.h" /*Dumb terminal window interface*/ #include "gtxX11win.h" /*X11 window interface*/ #include /*Command interpretation library*/ +#include -extern int errno; /* * Command line parameter indicies. diff --git a/src/package/fileops.c b/src/package/fileops.c index d71d37096..491c77400 100644 --- a/src/package/fileops.c +++ b/src/package/fileops.c @@ -27,6 +27,13 @@ #include #include #include +#ifdef HAVE_STRING_H +#include +#else +#ifdef HAVE_STRINGS_H +#include +#endif +#endif #include #ifdef AFS_SUN5_ENV #include @@ -34,8 +41,6 @@ #include "globals.h" #include "package.h" -extern char *strcpy(); -extern int errno; int mv(from,to) register char *from; diff --git a/src/package/messages.c b/src/package/messages.c index 14f09731a..9664b2880 100644 --- a/src/package/messages.c +++ b/src/package/messages.c @@ -29,6 +29,8 @@ #endif #include #include "package.h" +#include + static char *putnum(dp, n, b) register char *dp; @@ -98,7 +100,6 @@ static char *putformat(dp, fp, ap) } case 'm': { - extern int errno; extern int sys_nerr; extern char *sys_errlist[]; diff --git a/src/pinstall/install.c b/src/pinstall/install.c index 1b14158df..f5f3497f0 100644 --- a/src/pinstall/install.c +++ b/src/pinstall/install.c @@ -49,7 +49,7 @@ Generic install command. Options are: #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/pinstall/install.c,v 1.1.1.9 2002/09/26 19:07:22 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/pinstall/install.c,v 1.2 2003/01/02 03:55:51 hartmans Exp $"); #include #include @@ -85,7 +85,6 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/pinstall/install.c,v 1.1.1.9 2002/09/26 struct stat istat, ostat; -extern int errno; #if !defined(AFS_DARWIN60_ENV) extern int sys_nerr; #endif diff --git a/src/ptserver/db_verify.c b/src/ptserver/db_verify.c index 004354ec1..3bd28111a 100644 --- a/src/ptserver/db_verify.c +++ b/src/ptserver/db_verify.c @@ -7,12 +7,11 @@ * directory or online at http://www.openafs.org/dl/license10.html */ -extern int errno; #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/ptserver/db_verify.c,v 1.1.1.8 2001/10/14 18:06:10 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/ptserver/db_verify.c,v 1.2 2003/01/02 03:55:51 hartmans Exp $"); #include #include diff --git a/src/ptserver/pt_util.c b/src/ptserver/pt_util.c index 87c9a3d4e..942a5dce2 100644 --- a/src/ptserver/pt_util.c +++ b/src/ptserver/pt_util.c @@ -1,4 +1,4 @@ -/* $Id: pt_util.c,v 1.5 2001/09/20 06:47:46 hartmans Exp $ */ +/* $Id: pt_util.c,v 1.6 2003/01/02 03:55:51 hartmans Exp $ */ /* * @@ -21,8 +21,9 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/ptserver/pt_util.c,v 1.5 2001/09/20 06:47:46 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/ptserver/pt_util.c,v 1.6 2003/01/02 03:55:51 hartmans Exp $"); +#include #include #include #define UBIK_INTERNALS @@ -39,7 +40,6 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/ptserver/pt_util.c,v 1.5 2001/09/20 06: extern char *optarg; extern int optind; -extern int errno; int display_entry(); void add_group(); diff --git a/src/scout/scout.c b/src/scout/scout.c index 082042767..412286669 100644 --- a/src/scout/scout.c +++ b/src/scout/scout.c @@ -14,7 +14,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/scout/scout.c,v 1.1.1.5 2001/09/11 14:34:47 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/scout/scout.c,v 1.2 2003/01/02 03:55:51 hartmans Exp $"); #undef IN #ifdef AFS_AIX32_ENV @@ -32,8 +32,9 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/scout/scout.c,v 1.1.1.5 2001/09/11 14:3 #include /*Standard I/O stuff*/ #include /*Command interpretation library*/ #include /*Interface for fsprobe module*/ +#include + -extern int errno; extern struct hostent *hostutil_GetHostByName(); extern int gtx_InputServer(); extern int gethostname(); diff --git a/src/sys/afssyscalls.c b/src/sys/afssyscalls.c index 0a577b49e..d2d6baac2 100644 --- a/src/sys/afssyscalls.c +++ b/src/sys/afssyscalls.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/sys/afssyscalls.c,v 1.1.1.4 2001/07/14 22:23:58 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/sys/afssyscalls.c,v 1.2 2003/01/02 03:55:51 hartmans Exp $"); #include #include @@ -27,6 +27,7 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/sys/afssyscalls.c,v 1.1.1.4 2001/07/14 #ifdef AFS_SGI_XFS_IOPS_ENV #include "xfsattrs.h" #endif +#include #include "afssyscalls.h" #ifdef AFS_DEBUG_IOPS @@ -238,8 +239,7 @@ struct iparam { icreate(dev, near_inode, param1, param2, param3, param4) int dev, near_inode, param1, param2, param3, param4; { - extern int errno; - int errcode; + int errcode; struct iparam iparams; iparams.param1 = param1; @@ -255,7 +255,6 @@ int dev, near_inode, param1, param2, param3, param4; iopen(dev, inode, usrmod) int dev, inode, usrmod; { - extern int errno; int errcode; errcode = syscall(AFS_SYSCALL, AFSCALL_IOPEN, dev, inode, usrmod); @@ -266,7 +265,6 @@ int dev, inode, usrmod; iinc(dev, inode, inode_p1) int dev, inode, inode_p1; { - extern int errno; int errcode; errcode = syscall(AFS_SYSCALL, AFSCALL_IINC, dev, inode, inode_p1); @@ -277,7 +275,6 @@ int dev, inode, inode_p1; idec(dev, inode, inode_p1) int dev, inode, inode_p1; { - extern int errno; int errcode; errcode = syscall(AFS_SYSCALL, AFSCALL_IDEC, dev, inode, inode_p1); @@ -292,7 +289,6 @@ unsigned int offset; char *cbuf; unsigned int count; { - extern int errno; int errcode; struct iparam iparams; @@ -311,7 +307,6 @@ unsigned int offset; char *cbuf; unsigned int count; { - extern int errno; int errcode; struct iparam iparams; @@ -329,7 +324,6 @@ unsigned int count; lsetpag() { - extern int errno; int errcode; errcode = syscall(AFS_SYSCALL, AFSCALL_SETPAG); @@ -340,7 +334,6 @@ lpioctl(path, cmd, cmarg, follow) char *path, *cmarg; int cmd, follow; { - extern int errno; int errcode; errcode = syscall(AFS_SYSCALL, AFSCALL_PIOCTL, path, cmd, cmarg, follow); diff --git a/src/sys/rmtsysd.c b/src/sys/rmtsysd.c index 5054a1988..77e05bdfb 100644 --- a/src/sys/rmtsysd.c +++ b/src/sys/rmtsysd.c @@ -16,7 +16,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/sys/rmtsysd.c,v 1.1.1.4 2001/07/14 22:24:04 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/sys/rmtsysd.c,v 1.2 2003/01/02 03:55:51 hartmans Exp $"); #ifdef AFS_AIX32_ENV #include @@ -28,11 +28,12 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/sys/rmtsysd.c,v 1.1.1.4 2001/07/14 22:2 #include #include #include +#include #include #include #include "rmtsys.h" -extern int errno; /* We ship this over the net if needed */ + extern RMTSYS_ExecuteRequest(); #define N_SECURITY_OBJECTS 1 /* No real security yet */ diff --git a/src/sys/rmtsyss.c b/src/sys/rmtsyss.c index 313730c9f..19ad7b25e 100644 --- a/src/sys/rmtsyss.c +++ b/src/sys/rmtsyss.c @@ -15,7 +15,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/sys/rmtsyss.c,v 1.1.1.6 2001/09/11 14:34:52 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/sys/rmtsyss.c,v 1.2 2003/01/02 03:55:51 hartmans Exp $"); #include #include @@ -25,6 +25,7 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/sys/rmtsyss.c,v 1.1.1.6 2001/09/11 14:3 #include #include #include +#include #include #include #ifdef HAVE_STRING_H @@ -33,7 +34,6 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/sys/rmtsyss.c,v 1.1.1.6 2001/09/11 14:3 /*#include */ #include "rmtsys.h" -extern int errno; /* We ship this over the net if needed */ extern RMTSYS_ExecuteRequest(); #define NFS_EXPORTER 1 /* To probably handle more later */ diff --git a/src/uss/uss_fs.c b/src/uss/uss_fs.c index 236d74c93..c4a9a0767 100644 --- a/src/uss/uss_fs.c +++ b/src/uss/uss_fs.c @@ -18,7 +18,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/uss/uss_fs.c,v 1.1.1.5 2001/09/11 14:35:06 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/uss/uss_fs.c,v 1.2 2003/01/02 03:55:51 hartmans Exp $"); #include "uss_fs.h" /*Interface to this module*/ #include @@ -28,10 +28,11 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/uss/uss_fs.c,v 1.1.1.5 2001/09/11 14:35 #ifdef AFS_SUN5_ENV #include #endif +#include #include #include #include "uss_common.h" -extern int errno; + /* diff --git a/src/uss/uss_kauth.c b/src/uss/uss_kauth.c index 0167ead34..1a3562960 100644 --- a/src/uss/uss_kauth.c +++ b/src/uss/uss_kauth.c @@ -18,7 +18,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/uss/uss_kauth.c,v 1.1.1.5 2001/09/11 14:35:06 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/uss/uss_kauth.c,v 1.2 2003/01/02 03:55:51 hartmans Exp $"); #include "uss_kauth.h" /*Module interface*/ #include "uss_common.h" /*Common defs & operations*/ @@ -28,7 +28,6 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/uss/uss_kauth.c,v 1.1.1.5 2001/09/11 14 #include /*MAXKTCREALMLEN*/ #include /* pack_long */ -extern int errno; extern afs_int32 KAM_CreateUser(); #define uss_kauth_MAX_SIZE 2048 diff --git a/src/uss/uss_procs.c b/src/uss/uss_procs.c index fa5abce5a..755e4c6bb 100644 --- a/src/uss/uss_procs.c +++ b/src/uss/uss_procs.c @@ -18,7 +18,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/uss/uss_procs.c,v 1.1.1.5 2001/09/11 14:35:06 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/uss/uss_procs.c,v 1.2 2003/01/02 03:55:52 hartmans Exp $"); #include "uss_procs.h" /*Module interface*/ #include "uss_common.h" /*Common defs & operations*/ @@ -33,7 +33,6 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/uss/uss_procs.c,v 1.1.1.5 2001/09/11 14 #endif #include /*MAXKTCREALMLEN*/ -extern int errno; #undef USS_PROCS_DB #undef USS_PROCS_DB_INSTANCE diff --git a/src/uss/uss_ptserver.c b/src/uss/uss_ptserver.c index 053c2a6f4..c850096ca 100644 --- a/src/uss/uss_ptserver.c +++ b/src/uss/uss_ptserver.c @@ -18,14 +18,13 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/uss/uss_ptserver.c,v 1.1.1.5 2001/09/11 14:35:07 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/uss/uss_ptserver.c,v 1.2 2003/01/02 03:55:52 hartmans Exp $"); #include "uss_ptserver.h" /*Module interface*/ #include /*Protection Server client interface*/ #include /*Protection Server error codes*/ #include /*Error code xlation*/ -extern int errno; #undef USS_PTSERVER_DB diff --git a/src/uss/uss_vol.c b/src/uss/uss_vol.c index 86270a460..a3adb6880 100644 --- a/src/uss/uss_vol.c +++ b/src/uss/uss_vol.c @@ -18,7 +18,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/uss/uss_vol.c,v 1.1.1.6 2002/09/26 19:08:53 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/uss/uss_vol.c,v 1.2 2003/01/02 03:55:52 hartmans Exp $"); #include "uss_vol.h" /*Interface to this module*/ #include "uss_common.h" /*Common definitions*/ @@ -27,7 +27,7 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/uss/uss_vol.c,v 1.1.1.6 2002/09/26 19:0 #include #include #include -#include +#include #include #include #include @@ -38,7 +38,6 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/uss/uss_vol.c,v 1.1.1.6 2002/09/26 19:0 #include #include -extern int errno; extern struct rx_connection *UV_Bind(); extern struct rx_securityClass *rxnull_NewClientSecurityObject(); extern int line; diff --git a/src/venus/fs.c b/src/venus/fs.c index a8c2421e5..4e929f8e8 100644 --- a/src/venus/fs.c +++ b/src/venus/fs.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/venus/fs.c,v 1.1.1.10 2002/09/26 19:09:04 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/venus/fs.c,v 1.2 2003/01/02 03:55:52 hartmans Exp $"); #include #include @@ -66,7 +66,7 @@ extern char *hostutil_GetNameByINet(); extern struct hostent *hostutil_GetHostByName(); extern afs_int32 VL_GetEntryByNameO(); -extern int errno; + extern struct cmd_syndesc *cmd_CreateSyntax(); static char pn[] = "fs"; static int rxInitDone = 0; diff --git a/src/venus/kdump.c b/src/venus/kdump.c index 203635c04..83c3f3e0c 100644 --- a/src/venus/kdump.c +++ b/src/venus/kdump.c @@ -7,8 +7,21 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include +#include + +RCSID("$Header: /tmp/cvstemp/openafs/src/venus/kdump.c,v 1.6 2003/01/02 03:55:52 hartmans Exp $"); + #include +#include #include /* for malloc() */ + +#ifdef AFS_LINUX24_ENV +#define __KERNEL__ +#include +#define _STRING_H 1 +#endif + #include #ifdef __linux__ @@ -48,8 +61,6 @@ struct ntfs_inode_info{}; /* This tells afs.h to pick up afs_args from the dest tree. */ #define KDUMP_KERNEL -#include - /* * Need to include before _KERNEL is defined since on IRIX 6.5 * includes , which in turn declares inet_addr() @@ -195,6 +206,13 @@ typedef struct adaptive_mutex2 adaptive_mutex2_t; #include #include #else /* AFS_MACH_ENV */ +#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#include +#include +#include +#include +#include +#else #include "sys/vfs.h" #ifdef AFS_LINUX20_ENV #define UIO_MAXIOV 1 /* don't care */ @@ -220,25 +238,42 @@ typedef struct adaptive_mutex2 adaptive_mutex2_t; #ifdef AFS_SPARC_LINUX20_ENV #define _SPARC_STATFS_H #else +#ifdef AFS_ALPHA_LINUX20_ENV +#define _ALPHA_STATFS_H +#else #define _I386_STATFS_H +#endif /* AFS_ALPHA_LINUX20_ENV */ #endif /* AFS_SPARC_LINUX20_ENV */ #endif /* AFS_SPARC64_LINUX20_ENV */ #endif /* AFS_S390_LINUX20_ENV */ struct timezone { int a,b; }; +#if 0/*ndef AFS_ALPHA_LINUX20_ENV*/ +#ifndef AFS_LINUX24_ENV typedef struct timeval { int tv_sec; int tv_usec; } timeval_t; /* Needed here since KERNEL defined. */ +#endif +#endif /*AFS_ALPHA_LINUX20_ENV*/ #if defined(AFSBIG_ENDIAN) #define _LINUX_BYTEORDER_BIG_ENDIAN_H #else #define _LINUX_BYTEORDER_LITTLE_ENDIAN_H #endif +/* Avoid problems with timer_t redefinition */ +#ifndef timer_t +#define timer_t ktimer_t +#define timer_t_redefined +#endif #include #include -#include +#include +#ifdef timer_t_redefined +#undef timer_t +#undef timer_t_redefined +#endif #else /* AFS_LINUX20_ENV */ #ifdef AFS_HPUX110_ENV #define KERNEL @@ -274,6 +309,7 @@ typedef enum _spustate { /* FROM /etc/conf/h/_types.h */ #endif #endif #endif +#endif #endif /* AFS_MACH_ENV */ #include #endif @@ -483,7 +519,6 @@ void print_cmstats(); #ifndef AFS_KDUMP_LIB extern struct cmd_syndesc *cmd_CreateSyntax(); #endif -extern int errno; int opencore(); /* Note: this should agree with the definition in afs_buffer.c */ @@ -924,6 +959,7 @@ int cnt, size; #endif /*AFS_KDUMP_LIB */ #endif +#if !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) int findsym( char *sname, off_t *offset ) { @@ -988,12 +1024,16 @@ findsym( char *sname, off_t *offset ) } #endif /* defined(AFS_SUN5_ENV) */ } +#endif #define CBHTSIZE 128 kdump() { int cell, cnt, cnt1; +#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) + printf("Kdump not supported\n"); +#else #ifndef AFS_KDUMP_LIB kmem = opencore(core); @@ -1123,9 +1163,11 @@ kdump() if (Dgcpags || Dall) { print_gcpags(1); } +#endif return 0; } +#if !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) int Sum_cellnames=0, Sum_userstp=0, Sum_volnames=0, Sum_exps=0, Sum_nfssysnames=0; int Sum_vcachemvids=0, Sum_vcachelinkData=0, Sum_vcacheacc=0, Sum_vcachelocks=0; @@ -1235,7 +1277,7 @@ int pnt; int chainCount[NSERVERS]; if (pnt) { - bzero((char*)chainCount, sizeof(chainCount)); + memset((char*)chainCount, 0, sizeof(chainCount)); printf("\n\nPrinting 'afs_servers' structures...\n"); } findsym( "afs_servers", &symoff); @@ -1273,7 +1315,7 @@ int pnt; /* Verify against afs_totalServers. */ if (pnt) { - bzero((char*)chainCount, sizeof(chainCount)); + memset((char*)chainCount, 0, sizeof(chainCount)); if (findsym( "afs_totalServers", &symoff)) { kread(kmem, symoff, (char*)&afs_totalServers, sizeof(afs_int32)); if (afs_totalServers != nServers) { @@ -1992,7 +2034,7 @@ void kread(int kmem,off_t loc,void *buf,KDUMP_SIZE_T len) { int i; - bzero(buf,len); + memset(buf, 0, len); #ifdef AFS_OSF_ENV if (mem) { @@ -2438,9 +2480,15 @@ void print_vnode(kmem, vep, ptr, pnt) printf("\ti_ino=%d, i_mode=%x, i_nlink=%d, i_uid=%d, i_gid=%d, i_size=%d\n", vep->i_ino, vep->i_mode, vep->i_nlink, vep->i_uid, vep->i_gid, vep->i_size); +#ifndef AFS_LINUX24_ENV printf("\ti_atime=%u, i_mtime=%u, i_ctime=%u, i_version=%u, i_nrpages=%u\n", vep->i_atime, vep->i_mtime, vep->i_ctime, vep->i_version, vep->i_nrpages); +#else + printf("\ti_atime=%u, i_mtime=%u, i_ctime=%u, i_version=%u\n", + vep->i_atime, vep->i_mtime, vep->i_ctime, vep->i_version + ); +#endif printf("\ti_op=0x%x, i_dev=0x%x, i_rdev=0x%x, i_sb=0x%x\n", vep->i_op, vep->i_dev, vep->i_rdev, vep->i_sb); #ifdef AFS_LINUX24_ENV @@ -3883,6 +3931,7 @@ void print_cmstats(cmp) printf("\t%10d afs_GetCell\n", cmp->callInfo.C_afs_GetCell); printf("\t%10d afs_GetCellByIndex\n", cmp->callInfo.C_afs_GetCellByIndex); printf("\t%10d afs_GetCellByName\n", cmp->callInfo.C_afs_GetCellByName); + printf("\t%10d afs_GetRealCellByIndex\n", cmp->callInfo.C_afs_GetRealCellByIndex); printf("\t%10d afs_NewCell\n", cmp->callInfo.C_afs_NewCell); printf("\t%10d CheckVLDB\n", cmp->callInfo.C_CheckVLDB); printf("\t%10d afs_GetVolume\n", cmp->callInfo.C_afs_GetVolume); @@ -4010,6 +4059,7 @@ void print_cmstats(cmp) #endif } +#endif #if 0 #define OffsetOf(s,mem) ((long)(&(((s *)0)->mem))) #define SizeOf(s,mem) ((long)sizeof(((s *)0)->mem)) diff --git a/src/venus/twiddle.c b/src/venus/twiddle.c index bfe600dc7..49d721a65 100644 --- a/src/venus/twiddle.c +++ b/src/venus/twiddle.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/venus/twiddle.c,v 1.1.1.4 2001/07/14 22:24:37 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/venus/twiddle.c,v 1.2 2003/01/02 03:55:53 hartmans Exp $"); #include #include @@ -30,7 +30,8 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/venus/twiddle.c,v 1.1.1.4 2001/07/14 22 #undef VICE #include "afs/prs_fs.h" #include -#include +#include > +#include #include #include @@ -44,7 +45,7 @@ static char space[MAXSIZE]; static char tspace[1024]; static struct ubik_client *uclient; -extern int errno; + extern struct cmd_syndesc *cmd_CreateSyntax(); static char pn[] = "fs"; static int rxInitDone = 0; diff --git a/src/vlserver/cnvldb.c b/src/vlserver/cnvldb.c index 392a14972..e1c766a5f 100644 --- a/src/vlserver/cnvldb.c +++ b/src/vlserver/cnvldb.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/vlserver/cnvldb.c,v 1.1.1.5 2001/09/11 14:35:37 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/vlserver/cnvldb.c,v 1.2 2003/01/02 03:55:53 hartmans Exp $"); #include #include @@ -30,7 +30,7 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/vlserver/cnvldb.c,v 1.1.1.5 2001/09/11 #define MAXSIZE 2048 /* most I'll get back from PIOCTL */ #define BADSERVERID 255 /* XXX */ -extern int errno; + extern struct cmd_syndesc *cmd_CreateSyntax(); static char pn[] = "cnvldb"; static char tempname[] = "XXnewvldb"; diff --git a/src/vlserver/sascnvldb.c b/src/vlserver/sascnvldb.c index 69292c254..0c73c78f6 100644 --- a/src/vlserver/sascnvldb.c +++ b/src/vlserver/sascnvldb.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/vlserver/sascnvldb.c,v 1.1.1.5 2001/09/11 14:35:37 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/vlserver/sascnvldb.c,v 1.2 2003/01/02 03:55:53 hartmans Exp $"); #include #include @@ -35,7 +35,7 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/vlserver/sascnvldb.c,v 1.1.1.5 2001/09/ #define MAXSIZE 2048 /* most I'll get back from PIOCTL */ -extern int errno; + extern struct cmd_syndesc *cmd_CreateSyntax(); static char pn[] = "cnvldb"; static char tempname[] = "XXnewvldb"; diff --git a/src/vol/fs_conv_411.c b/src/vol/fs_conv_411.c index 9108e0295..8aa0f824b 100644 --- a/src/vol/fs_conv_411.c +++ b/src/vol/fs_conv_411.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/vol/fs_conv_411.c,v 1.1.1.5 2001/09/11 14:35:41 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/vol/fs_conv_411.c,v 1.2 2003/01/02 03:55:53 hartmans Exp $"); #if defined(AFS_DUX40_ENV) || (defined(AFS_SUN_ENV) && !defined(AFS_SUN5_ENV)) || defined(AFS_SUN54_ENV) #if defined AFS_DUX40_ENV @@ -84,7 +84,6 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/vol/fs_conv_411.c,v 1.1.1.5 2001/09/11 int icount=0, iarraysize=0, *iarray; char *rawname(), *unrawname(), *vol_DevName(), *blockcheck(); -extern int errno; #define ROOTINODE 2 int force = 0, verbose = 0, unconv = 0; diff --git a/src/vol/partition.c b/src/vol/partition.c index e35324a82..b72b709e5 100644 --- a/src/vol/partition.c +++ b/src/vol/partition.c @@ -18,7 +18,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/vol/partition.c,v 1.12 2002/09/26 19:18:09 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/vol/partition.c,v 1.13 2003/01/02 03:55:53 hartmans Exp $"); #include #ifdef AFS_NT40_ENV @@ -59,7 +59,7 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/vol/partition.c,v 1.12 2002/09/26 19:18 #endif #endif /* AFS_VFSINCL_ENV */ #endif /* AFS_OSF_ENV */ -#include +#include #include #include #include @@ -811,7 +811,6 @@ void VSetPartitionDiskUsage_r(register struct DiskPartition *dp) #else void VSetPartitionDiskUsage_r(register struct DiskPartition *dp) { - extern int errno; int fd, totalblks, free, used, availblks, bsize, code; int reserved; #if AFS_HAVE_STATVFS -- 2.39.5