From a3f05a66ee4a93ee37aec7d783d531dba7d48e7e Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Sat, 11 Jan 2003 07:42:31 +0000 Subject: [PATCH] STABLE12-include-errno-dont-declare-it-20030111 include errno.h instead of extern int errno ourselves (cherry picked from commit 92e76f7eb20ea548dfc2d688d9d6eeb6a58e2c18) --- src/afsmonitor/afsmonitor.c | 2 +- src/butm/butm_test.c | 3 ++- src/export/cfgafs.c | 3 ++- src/export/cfgexport.c | 2 +- src/gtx/curseswindows.c | 2 +- src/gtx/dumbwindows.c | 4 +--- src/gtx/object_test.c | 2 +- src/gtx/screen_test.c | 2 +- src/package/fileops.c | 9 +++++++-- src/package/messages.c | 3 ++- src/pinstall/install.c | 1 - src/ptserver/db_verify.c | 1 - src/ptserver/pt_util.c | 2 +- src/scout/scout.c | 3 ++- src/sys/afssyscalls.c | 11 ++--------- src/sys/rmtsysd.c | 3 ++- src/sys/rmtsyss.c | 2 +- src/uss/uss_fs.c | 3 ++- src/uss/uss_kauth.c | 1 - src/uss/uss_procs.c | 1 - src/uss/uss_ptserver.c | 1 - src/uss/uss_vol.c | 3 +-- src/venus/fs.c | 2 +- src/venus/fstrace.c | 9 ++++----- src/venus/kdump.c | 2 +- src/venus/twiddle.c | 5 +++-- src/vlserver/cnvldb.c | 2 +- src/vlserver/sascnvldb.c | 2 +- src/vol/fs_conv_411.c | 1 - src/vol/partition.c | 3 +-- 30 files changed, 42 insertions(+), 48 deletions(-) diff --git a/src/afsmonitor/afsmonitor.c b/src/afsmonitor/afsmonitor.c index f399e8be3..0bef79996 100644 --- a/src/afsmonitor/afsmonitor.c +++ b/src/afsmonitor/afsmonitor.c @@ -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 04b55445e..86a0599b5 100644 --- a/src/butm/butm_test.c +++ b/src/butm/butm_test.c @@ -12,6 +12,7 @@ RCSID("$Header$"); +#include #include #include #include @@ -23,7 +24,7 @@ RCSID("$Header$"); #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 b48afd7c3..b7357fa66 100644 --- a/src/export/cfgafs.c +++ b/src/export/cfgafs.c @@ -15,6 +15,7 @@ RCSID("$Header$"); +#include #include #include #include @@ -26,7 +27,7 @@ RCSID("$Header$"); #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 16f85c496..430a6bc67 100644 --- a/src/export/cfgexport.c +++ b/src/export/cfgexport.c @@ -15,6 +15,7 @@ RCSID("$Header$"); +#include #include #include #include @@ -29,7 +30,6 @@ RCSID("$Header$"); #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 4c9fa6ea9..86d0fd8b5 100644 --- a/src/gtx/curseswindows.c +++ b/src/gtx/curseswindows.c @@ -41,7 +41,7 @@ RCSID("$Header$"); #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 5bd3afe58..807af57c4 100644 --- a/src/gtx/dumbwindows.c +++ b/src/gtx/dumbwindows.c @@ -20,10 +20,8 @@ RCSID("$Header$"); #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 49fbcc922..7235a5f24 100644 --- a/src/gtx/object_test.c +++ b/src/gtx/object_test.c @@ -23,10 +23,10 @@ RCSID("$Header$"); #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 98cab3106..860516a50 100644 --- a/src/gtx/screen_test.c +++ b/src/gtx/screen_test.c @@ -21,8 +21,8 @@ RCSID("$Header$"); #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 6a8ffc3a7..665f0f5d1 100644 --- a/src/pinstall/install.c +++ b/src/pinstall/install.c @@ -85,7 +85,6 @@ RCSID("$Header$"); 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 f41b03f6f..feb20bdf7 100644 --- a/src/ptserver/db_verify.c +++ b/src/ptserver/db_verify.c @@ -7,7 +7,6 @@ * directory or online at http://www.openafs.org/dl/license10.html */ -extern int errno; #include #include diff --git a/src/ptserver/pt_util.c b/src/ptserver/pt_util.c index 8a5cae4a2..ebe0cc2d2 100644 --- a/src/ptserver/pt_util.c +++ b/src/ptserver/pt_util.c @@ -23,6 +23,7 @@ RCSID("$Header$"); +#include #include #include #define UBIK_INTERNALS @@ -39,7 +40,6 @@ RCSID("$Header$"); 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 1d338b9b9..baa6e09f0 100644 --- a/src/scout/scout.c +++ b/src/scout/scout.c @@ -32,8 +32,9 @@ RCSID("$Header$"); #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 e1088cb99..5b55d3747 100644 --- a/src/sys/afssyscalls.c +++ b/src/sys/afssyscalls.c @@ -27,6 +27,7 @@ RCSID("$Header$"); #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 1a85b2f8a..cbe8184c0 100644 --- a/src/sys/rmtsysd.c +++ b/src/sys/rmtsysd.c @@ -28,11 +28,12 @@ RCSID("$Header$"); #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 2657b6acc..4685cfe35 100644 --- a/src/sys/rmtsyss.c +++ b/src/sys/rmtsyss.c @@ -25,6 +25,7 @@ RCSID("$Header$"); #include #include #include +#include #include #include #ifdef HAVE_STRING_H @@ -33,7 +34,6 @@ RCSID("$Header$"); /*#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 d3d7af96e..a1c0e23a3 100644 --- a/src/uss/uss_fs.c +++ b/src/uss/uss_fs.c @@ -28,10 +28,11 @@ RCSID("$Header$"); #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 f95cbb9ff..22af30f24 100644 --- a/src/uss/uss_kauth.c +++ b/src/uss/uss_kauth.c @@ -28,7 +28,6 @@ RCSID("$Header$"); #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 c6e003c64..5d7881713 100644 --- a/src/uss/uss_procs.c +++ b/src/uss/uss_procs.c @@ -33,7 +33,6 @@ RCSID("$Header$"); #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 530b11557..1747f0d61 100644 --- a/src/uss/uss_ptserver.c +++ b/src/uss/uss_ptserver.c @@ -25,7 +25,6 @@ RCSID("$Header$"); #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 2af41b803..fbf34aace 100644 --- a/src/uss/uss_vol.c +++ b/src/uss/uss_vol.c @@ -27,7 +27,7 @@ RCSID("$Header$"); #include #include #include -#include +#include #include #include #include @@ -38,7 +38,6 @@ RCSID("$Header$"); #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 ac7156fae..0780e0dae 100644 --- a/src/venus/fs.c +++ b/src/venus/fs.c @@ -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/fstrace.c b/src/venus/fstrace.c index 1f430eb1a..9db2c628b 100644 --- a/src/venus/fstrace.c +++ b/src/venus/fstrace.c @@ -2104,11 +2104,10 @@ long call, parm0, parm1, parm2, parm3, parm4, parm5, parm6; } #if defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_SPARC_LINUX20_ENV) /* on sparc this function returns none value, so do it myself */ - __asm__ __volatile__ (" - mov %o0, %i0 - ret - restore -"); + __asm__ __volatile__ ( + "mov %o0, %i0\n\t" + "ret\n\t" + "restore"); #endif #else #if !defined(AFS_SGI_ENV) && !defined(AFS_AIX32_ENV) diff --git a/src/venus/kdump.c b/src/venus/kdump.c index 5fa821b48..91e7a4d8d 100644 --- a/src/venus/kdump.c +++ b/src/venus/kdump.c @@ -13,6 +13,7 @@ RCSID("$Header$"); #include +#include #include /* for malloc() */ #ifdef AFS_LINUX24_ENV @@ -518,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 */ diff --git a/src/venus/twiddle.c b/src/venus/twiddle.c index c8e9fd9fd..14be6065c 100644 --- a/src/venus/twiddle.c +++ b/src/venus/twiddle.c @@ -30,7 +30,8 @@ RCSID("$Header$"); #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 782f3ed33..336cb7021 100644 --- a/src/vlserver/cnvldb.c +++ b/src/vlserver/cnvldb.c @@ -30,7 +30,7 @@ RCSID("$Header$"); #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 08a366790..c6cf2d688 100644 --- a/src/vlserver/sascnvldb.c +++ b/src/vlserver/sascnvldb.c @@ -35,7 +35,7 @@ RCSID("$Header$"); #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 1cf2ce5b1..b42679706 100644 --- a/src/vol/fs_conv_411.c +++ b/src/vol/fs_conv_411.c @@ -84,7 +84,6 @@ RCSID("$Header$"); 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 73a694694..d42bc05ae 100644 --- a/src/vol/partition.c +++ b/src/vol/partition.c @@ -59,7 +59,7 @@ RCSID("$Header$"); #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