pull-prototypes-to-head-20020821

[openafs.git] / src / uss / uss_fs.c

diff --git a/src/uss/uss_fs.c b/src/uss/uss_fs.c
index d3d7af9..679ccce 100644 (file)
--- a/src/uss/uss_fs.c
+++ b/src/uss/uss_fs.c
@@ -29,6 +29,15 @@ RCSID("$Header$");
 #include <sys/ioccom.h>
 #endif
 #include <netinet/in.h>
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+
 #include <afs/venus.h>
 #include "uss_common.h"
 extern int errno;
@@ -75,7 +84,7 @@ static int InAFS(a_path)
     static char rn[] = "uss_fs:InAFS";
     register afs_int32 code;
 
-    blob.in       = (char *)0;
+    blob.in       = NULL;
     blob.in_size  = 0;
     blob.out_size = USS_FS_MAX_SIZE;
     blob.out      = uss_fs_OutBuff;
@@ -232,7 +241,7 @@ afs_int32 uss_fs_GetACL(a_dirPath, a_aclBuff, a_aclBuffBytes)
     static char rn[] = "uss_fs_GetACL";        /*Routine name*/
     register afs_int32 code;                   /*pioctl() result*/
 
-    blob.in      = (char *)0;
+    blob.in      = NULL;
     blob.in_size  = 0;
     blob.out      = a_aclBuff;
     blob.out_size = a_aclBuffBytes;
@@ -276,7 +285,7 @@ afs_int32 uss_fs_SetACL(a_dirPath, a_aclBuff, a_aclBuffBytes)
 
     blob.in      = a_aclBuff;
     blob.in_size  = a_aclBuffBytes;
-    blob.out      = (char *)0;
+    blob.out      = NULL;
     blob.out_size = 0;
 
 #ifdef USS_FS_DB
@@ -318,7 +327,7 @@ afs_int32 uss_fs_GetVolStat(a_mountpoint, a_volStatBuff, a_volStatBuffBytes)
     static char rn[] = "uss_fs_GetVolStat";    /*Routine name*/
     register afs_int32 code;                           /*pioctl() result*/
 
-    blob.in      = (char *)0;
+    blob.in      = NULL;
     blob.in_size  = 0;
     blob.out      = a_volStatBuff;
     blob.out_size = a_volStatBuffBytes;
@@ -399,9 +408,9 @@ afs_int32 uss_fs_CkBackups()
     static char rn[] = "uss_fs_CkBackups";     /*Routine name*/
     register afs_int32 code;                           /*pioctl() result*/
 
-    blob.in       = (char *)0;
+    blob.in       = NULL;
     blob.in_size  = 0;
-    blob.out      = (char *)0;
+    blob.out      = NULL;
     blob.out_size = 0;
     
 #ifdef USS_FS_DB
@@ -409,7 +418,7 @@ afs_int32 uss_fs_CkBackups()
           rn, blob.in, blob.in_size, blob.out, blob.out_size);
 #endif /* USS_FS_DB */
 
-    code = pioctl((char *)0,   /*No pathname needed here*/
+    code = pioctl(NULL,        /*No pathname needed here*/
                  VIOCCKBACK,   /*CheckBackups*/
                  &blob,                /*Params*/
                  1);           /*Symlink disposition*/
@@ -542,7 +551,7 @@ afs_int32 uss_fs_RmMountPoint(a_mountpoint)
      */
     blob.in      = componentP;
     blob.in_size  = strlen(componentP) + 1;
-    blob.out      = (char *)0;
+    blob.out      = NULL;
     blob.out_size = 0;
 
     if (!uss_DryRun) {