Unused variable cleanup

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

diff --git a/src/uss/uss_ptserver.c b/src/uss/uss_ptserver.c
index 98c47c8..10bd652 100644 (file)
--- a/src/uss/uss_ptserver.c
+++ b/src/uss/uss_ptserver.c
@@ -18,12 +18,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID
-    ("$Header$");
 
 #include "uss_ptserver.h"      /*Module interface */
 #include <afs/ptclient.h>      /*Protection Server client interface */
 #include <afs/pterror.h>       /*Protection Server error codes */
+#include <afs/ptuser.h>
 #include <afs/com_err.h>       /*Error code xlation */
 
 
@@ -66,10 +65,12 @@ static int initDone = 0;    /*Module initialized? */
  *------------------------------------------------------------------------*/
 
 static afs_int32
-InitThisModule()
+InitThisModule(void)
 {                              /*InitThisModule */
 
+#ifdef USS_PTSERVER_DB
     static char rn[] = "uss_ptserver:InitThisModule";  /*Routine name */
+#endif
     register afs_int32 code;   /*Return code */
 
     /*
@@ -90,7 +91,7 @@ InitThisModule()
                         uss_ConfDir,   /*Config directory */
                         uss_Cell);     /*Cell to touch */
     if (code) {
-       com_err(uss_whoami, code,
+       afs_com_err(uss_whoami, code,
                "while initializing Protection Server library");
        return (code);
     }
@@ -113,10 +114,7 @@ InitThisModule()
  *------------------------------------------------------------------------*/
 
 afs_int32
-uss_ptserver_AddUser(a_user, a_uid)
-     char *a_user;
-     char *a_uid;
-
+uss_ptserver_AddUser(char *a_user, char *a_uid)
 {                              /*uss_ptserver_AddUser */
 
     afs_int32 code;            /*Various return codes */
@@ -175,8 +173,8 @@ uss_ptserver_AddUser(a_user, a_uid)
             * ID known for the user name.
             */
            mappedUserID = id;
-           if (code = pr_SNameToId(a_user, &mappedUserID)) {
-               com_err(uss_whoami, code,
+           if ((code = pr_SNameToId(a_user, &mappedUserID))) {
+               afs_com_err(uss_whoami, code,
                        "while getting uid from Protection Server");
                return (code);
            }
@@ -198,7 +196,7 @@ uss_ptserver_AddUser(a_user, a_uid)
            /*
             * Got a fatal error.
             */
-           com_err(uss_whoami, code, "while accessing Protection Server");
+           afs_com_err(uss_whoami, code, "while accessing Protection Server");
            return (code);
        }
     }
@@ -226,9 +224,7 @@ uss_ptserver_AddUser(a_user, a_uid)
  *------------------------------------------------------------------------*/
 
 afs_int32
-uss_ptserver_DelUser(a_name)
-     char *a_name;
-
+uss_ptserver_DelUser(char *a_name)
 {                              /*uss_ptserver_DelUser */
 
     afs_int32 code;            /*Various return codes */
@@ -268,7 +264,7 @@ uss_ptserver_DelUser(a_name)
                    uss_whoami, a_name);
        } /*User not registered */
        else {
-           com_err(uss_whoami, code,
+           afs_com_err(uss_whoami, code,
                    "while deleting user from Protection DB");
            return (code);
        }                       /*Fatal PTS error */
@@ -294,13 +290,11 @@ uss_ptserver_DelUser(a_name)
  *------------------------------------------------------------------------*/
 
 afs_int32
-uss_ptserver_XlateUser(a_user, a_uidP)
-     char *a_user;
-     afs_int32 *a_uidP;
-
+uss_ptserver_XlateUser(char *a_user, afs_int32 *a_uidP)
 {                              /*uss_ptserver_XlateUser */
-
+#ifdef USS_PTSERVER_DB
     static char rn[] = "uss_ptserver_XlateUser";       /*Routine name */
+#endif
     register afs_int32 code;   /*Various return codes */
 
     if (uss_verbose)
@@ -326,7 +320,7 @@ uss_ptserver_XlateUser(a_user, a_uidP)
     *a_uidP = 0;
     code = pr_SNameToId(a_user, a_uidP);
     if (code) {
-       com_err(uss_whoami, code, "while getting uid from Protection DB");
+       afs_com_err(uss_whoami, code, "while getting uid from Protection DB");
        return (code);
     }
     if (*a_uidP == ANONYMOUSID) {