uss-fix-typo-20020909

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

diff --git a/src/uss/uss_vol.c b/src/uss/uss_vol.c
index abfa6b7..d9964e9 100644 (file)
--- a/src/uss/uss_vol.c
+++ b/src/uss/uss_vol.c
@@ -15,6 +15,11 @@
 /*
  * --------------------- Required definitions ---------------------
  */
+#include <afsconfig.h>
+#include <afs/param.h>
+
+RCSID("$Header$");
+
 #include "uss_vol.h"           /*Interface to this module*/
 #include "uss_common.h"                /*Common definitions*/
 #include "uss_procs.h"         /*Defs from procs module*/
@@ -23,6 +28,15 @@
 #include <pwd.h>
 #include <netdb.h>
 #include <sys/errno.h>
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+
 #include <afs/vlserver.h>
 #include <afs/auth.h>
 #include <afs/cellconfig.h>
@@ -35,7 +49,6 @@
 
 extern int errno;
 extern struct rx_connection *UV_Bind();
-extern  struct rx_securityClass *rxnull_NewClientSecurityObject();
 extern int line;
 extern int VL_GetEntryByID();
 extern char *hostutil_GetNameByINet();
@@ -163,7 +176,7 @@ static afs_int32 InitThisModule(a_noAuthFlag, a_confDir, a_cellName)
        strcpy(sname.cell, info.name);
        sname.instance[0] = 0;
        strcpy(sname.name, "afs");
-       code = ktc_GetToken(&sname, &ttoken, sizeof(ttoken), (char *)0);
+       code = ktc_GetToken(&sname, &ttoken, sizeof(ttoken), NULL);
        if (code) {
            fprintf(stderr,
                    "%s: Couldn't get AFS tokens, running unauthenticated.\n",
@@ -400,7 +413,7 @@ afs_int32 uss_vol_GetServer(a_name)
     th = gethostbyname(a_name);
     if (!th)
        return(0);
-    bcopy(th->h_addr, &addr, sizeof(addr));
+    memcpy(&addr, th->h_addr, sizeof(addr));
     return(addr);
 
 }  /*uss_vol_GetServer*/
@@ -555,7 +568,7 @@ static int CheckDoubleMount(a_mp, a_oldmp)
     struct stat stbuf;
     
     pws = getpwuid(atoi(uss_Uid));
-    if (pws != (struct passwd *)0) {
+    if (pws != NULL) {
        /*
         * User exists in the password file, so they've been fully
         * created and integrated.  Return the ``ancient'' mountpoint.
@@ -1109,7 +1122,7 @@ afs_int32 uss_vol_GetVolInfoFromMountPoint(a_mountpoint)
      */
     MapHostToNetwork(&vldbEntry);
     if (vldbEntry.volumeId[RWVOL] != volID) {
-       printf("s: Volume '%s' (ID %d) is not a read/write volume!!\n",
+       printf("%s: Volume '%s' (ID %d) is not a read/write volume!!\n",
               uss_whoami, uss_Volume, volID);
        return(-1);
     }