STABLE12-include-errno-dont-declare-it-20030111

include errno.h instead of extern int errno ourselves

(cherry picked from commit 92e76f7eb20ea548dfc2d688d9d6eeb6a58e2c18)

diff --git a/src/afsmonitor/afsmonitor.c b/src/afsmonitor/afsmonitor.c
index f399e8be3fa35bf1692d815dc1453b0a88171dbf..0bef79996ae94bd25965a5d1bdaad599edb04ff8 100644 (file)
--- 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 04b55445e0f161df5bc6cadcb73048213bb1a215..86a0599b50923bcf7d1da4395153beb28a358eb5 100644 (file)
--- a/src/butm/butm_test.c
+++ b/src/butm/butm_test.c
@@ -12,6 +12,7 @@
 
 RCSID("$Header$");
 
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/stat.h>
@@ -23,7 +24,7 @@ RCSID("$Header$");
 #include <afs/butm.h>
 #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 b48afd7c35a22d6e86c99b94ef0f18fa7bc0ce31..b7357fa66eff3584bec587de58e5c9ceae38ef29 100644 (file)
--- a/src/export/cfgafs.c
+++ b/src/export/cfgafs.c
@@ -15,6 +15,7 @@
 
 RCSID("$Header$");
 
+#include <errno.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/types.h>
@@ -26,7 +27,7 @@ RCSID("$Header$");
 #include <signal.h>
 
 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 16f85c496c12566aa353ee2ce209e3e6d726b44e..430a6bc6766464738fb774b4e0242536f9ff3445 100644 (file)
--- a/src/export/cfgexport.c
+++ b/src/export/cfgexport.c
@@ -15,6 +15,7 @@
 
 RCSID("$Header$");
 
+#include <errno.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/types.h>
@@ -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 4c9fa6ea9b2d4e6ccbd8db9f557115abc8f2ff9e..86d0fd8b5a4f42b7cfe17fa7d006cb94f60e421a 100644 (file)
--- 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 5bd3afe580798a1e7255fd2cc60e7d5b481e9fe9..807af57c4c326aa431e9e1b2dfcca3399cb5c5f9 100644 (file)
--- a/src/gtx/dumbwindows.c
+++ b/src/gtx/dumbwindows.c
@@ -20,10 +20,8 @@ RCSID("$Header$");
 
 #include "gtxdumbwin.h"                        /*Interface definition*/
 #include <stdio.h>                     /*Standard I/O package*/
+#include <errno.h>
 
-#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 49fbcc922f40d95a4fbc99ebc1366223036c5192..7235a5f246ae98809b1b79004e8d734b58aa7d15 100644 (file)
--- 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 <errno.h>
 #include <stdio.h>                  /*Standard I/O stuff*/
 #include <cmd.h>                   /*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 98cab3106b8cadb502cfa4900e3afffcfcada792..860516a502c2b6478375800f0f73950963b32ec7 100644 (file)
--- 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 <cmd.h>                   /*Command interpretation library*/
+#include <errno.h>
 
-extern int errno;
 
 /*
  * Command line parameter indicies.

diff --git a/src/package/fileops.c b/src/package/fileops.c
index d71d37096fe4d41c74ec6f36a9d8c67047990498..491c774006abeecf3dce328a05882f2d39b0060e 100644 (file)
--- a/src/package/fileops.c
+++ b/src/package/fileops.c
@@ -27,6 +27,13 @@
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <dirent.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
 #include <errno.h>
 #ifdef AFS_SUN5_ENV
 #include <sys/fcntl.h>
@@ -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 14f09731a31600b697413f40e091b5702cca5ccf..9664b288034b4251e5e5d3b61d9ee828171c6f90 100644 (file)
--- a/src/package/messages.c
+++ b/src/package/messages.c
@@ -29,6 +29,8 @@
 #endif
 #include <varargs.h>
 #include "package.h"
+#include <errno.h>
+
 
 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 6a8ffc3a7aa9b8ae3193fc5cee688f3e23b95203..665f0f5d14c338656b54b49828c1e2cc890078f3 100644 (file)
--- 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 f41b03f6f0b7959eedf103d272a17244480088a8..feb20bdf72e4e5cd43dfa623aa9a32ba5d29b5a4 100644 (file)
--- 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 <afsconfig.h>
 #include <afs/param.h>

diff --git a/src/ptserver/pt_util.c b/src/ptserver/pt_util.c
index 8a5cae4a2534b96ca62f2e861f06b118653a213f..ebe0cc2d23b45de0f7ef90afc580e70bb7b60b8e 100644 (file)
--- a/src/ptserver/pt_util.c
+++ b/src/ptserver/pt_util.c
@@ -23,6 +23,7 @@
 
 RCSID("$Header$");
 
+#include <errno.h>
 #include <lock.h>
 #include <netinet/in.h>
 #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 1d338b9b9d2ed51bc524efeec8c550adfee3800c..baa6e09f0a570281994a2aa9c1cb7ce5ad82ef1b 100644 (file)
--- a/src/scout/scout.c
+++ b/src/scout/scout.c
@@ -32,8 +32,9 @@ RCSID("$Header$");
 #include <stdio.h>             /*Standard I/O stuff*/
 #include <cmd.h>               /*Command interpretation library*/
 #include <fsprobe.h>           /*Interface for fsprobe module*/
+#include <errno.h>
+
 
-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 e1088cb99cfbdec0ca04b5709276986e48caa320..5b55d374786d14a3d1f130e64c510da8a1f58568 100644 (file)
--- 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 <errno.h>
 #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 1a85b2f8a96693eb51eb19ac4ecfca670d081363..cbe8184c0d966c90a307e4089fb2d037c90a7acb 100644 (file)
--- a/src/sys/rmtsysd.c
+++ b/src/sys/rmtsysd.c
@@ -28,11 +28,12 @@ RCSID("$Header$");
 #include <netinet/in.h>
 #include <sys/stat.h>
 #include <sys/file.h>
+#include <errno.h>
 #include <stdio.h>
 #include <rx/xdr.h>
 #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 2657b6accf6305f8f53104d5c5ce3fafcf902296..4685cfe3534d93c847cf836bd3060448e9edd3e2 100644 (file)
--- a/src/sys/rmtsyss.c
+++ b/src/sys/rmtsyss.c
@@ -25,6 +25,7 @@ RCSID("$Header$");
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <stdio.h>
+#include <errno.h>
 #include <rx/xdr.h>
 #include <signal.h>
 #ifdef HAVE_STRING_H
@@ -33,7 +34,6 @@ RCSID("$Header$");
 /*#include <afs/cellconfig.h>*/
 #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 d3d7af96e23a4d0e35cb61620d544e6696ad6346..a1c0e23a38424d237a102b27f6cd0b46b8da793a 100644 (file)
--- a/src/uss/uss_fs.c
+++ b/src/uss/uss_fs.c
@@ -28,10 +28,11 @@ RCSID("$Header$");
 #ifdef AFS_SUN5_ENV
 #include <sys/ioccom.h>
 #endif
+#include <errno.h>
 #include <netinet/in.h>
 #include <afs/venus.h>
 #include "uss_common.h"
-extern int errno;
+
 
 
 /*

diff --git a/src/uss/uss_kauth.c b/src/uss/uss_kauth.c
index f95cbb9ffd0b8a9c3c21c7e0478b605f65e86fb7..22af30f244f742c5095fa8f1763058ffec789e1e 100644 (file)
--- a/src/uss/uss_kauth.c
+++ b/src/uss/uss_kauth.c
@@ -28,7 +28,6 @@ RCSID("$Header$");
 #include <afs/kautils.h>       /*MAXKTCREALMLEN*/
 #include <afs/kaport.h>         /* 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 c6e003c64f72aac6d9843ab219a95489e6f4cb3f..5d788171397a95a3f445dd08cf8d672b9b3bcfef 100644 (file)
--- a/src/uss/uss_procs.c
+++ b/src/uss/uss_procs.c
@@ -33,7 +33,6 @@ RCSID("$Header$");
 #endif
 #include <afs/kautils.h>       /*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 530b11557e5bfd1c9b9ee5fb19bf3d2c78efa514..1747f0d612cd51b7053a65c2d891ccb2c72bc97e 100644 (file)
--- a/src/uss/uss_ptserver.c
+++ b/src/uss/uss_ptserver.c
@@ -25,7 +25,6 @@ RCSID("$Header$");
 #include <afs/pterror.h>       /*Protection Server error codes*/
 #include <afs/com_err.h>       /*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 2af41b8034397ea539186133c8e3e8450b53e13b..fbf34aace95d930b202a601d089b5758fefe8ac9 100644 (file)
--- a/src/uss/uss_vol.c
+++ b/src/uss/uss_vol.c
@@ -27,7 +27,7 @@ RCSID("$Header$");
 #include <sys/stat.h>
 #include <pwd.h>
 #include <netdb.h>
-#include <sys/errno.h>
+#include <errno.h>
 #include <afs/vlserver.h>
 #include <afs/auth.h>
 #include <afs/cellconfig.h>
@@ -38,7 +38,6 @@ RCSID("$Header$");
 #include <afs/keys.h>
 #include <ubik.h>
 
-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 ac7156faee16d9510c05486e2df4b65bc8cd42ac..0780e0dae09262f4866bb290a5e405e5898d0134 100644 (file)
--- 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 1f430eb1a78f4c7f47ba74bdff89419cec776236..9db2c628b6a2ea252384ef10d95f476b04b13710 100644 (file)
--- 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 5fa821b4839c807eed585f0a318d999baa450f16..91e7a4d8d0693a0b664199186b0ebe1323abc579 100644 (file)
--- a/src/venus/kdump.c
+++ b/src/venus/kdump.c
@@ -13,6 +13,7 @@
 RCSID("$Header$");
 
 #include <stdio.h>
+#include <errno.h>
 #include <stdlib.h>    /* 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 c8e9fd9fde9e7aaa9d5a00868d58f6bb92069c1e..14be6065cc48436e4ec4f7e72fa3c91e52f18f04 100644 (file)
--- a/src/venus/twiddle.c
+++ b/src/venus/twiddle.c
@@ -30,7 +30,8 @@ RCSID("$Header$");
 #undef VICE
 #include "afs/prs_fs.h"
 #include <afs/afsint.h>
-#include <afs/auth.h>
+#include <afs/auth.h>>
+#include <errno.h
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
 #include <strings.h>
@@ -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 782f3ed335528be9fbddc22da3393be9dca059d1..336cb7021a378a04db243dcb2d75b5ae0697cc22 100644 (file)
--- 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 08a3667903cd260cc20585733cae01a377e79a46..c6cf2d68825651fc17f3dfc56712fddcbbda43ae 100644 (file)
--- 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 1cf2ce5b165ff0286a9798ef7818f8688defe092..b42679706a0a05adf410f1af3d51e8242a4bbdca 100644 (file)
--- 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 73a694694c8e9fbea894f1e6ac8fa22212ca6220..d42bc05ae1c70fbb0d199949171fd4e4ce047ca3 100644 (file)
--- 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 <sys/errno.h>
+#include <errno.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <sys/file.h>
@@ -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