update: Don't cast returns from malloc()

[openafs.git] / src / update / utils.c

diff --git a/src/update/utils.c b/src/update/utils.c
index 443cbe7..1d5dc6a 100644 (file)
--- a/src/update/utils.c
+++ b/src/update/utils.c
@@ -1,56 +1,48 @@
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
- * 
+ *
  * This software has been released under the terms of the IBM Public
  * License.  For details, see the LICENSE file in the top-level source
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
-#include <rx/rxkad.h>
-#include "global.h"
+
+#include <roken.h>
+
 #ifdef AFS_NT40_ENV
 #include <afs/errmap_nt.h>
 #include <afs/afsutil.h>
 #include <WINNT/afssw.h>
 #endif
-#include <stdio.h>
+
+#include <rx/rxkad.h>
+#include "global.h"
 
 
-AddToList(ah, aname)
-struct filestr **ah;
-char *aname; {
-    register struct filestr *tf;
-    tf = (struct filestr *) malloc(sizeof(struct filestr));
+int
+AddToList(struct filestr **ah, char *aname)
+{
+    struct filestr *tf;
+    tf = malloc(sizeof(struct filestr));
     tf->next = *ah;
     *ah = tf;
-    tf->name = (char *) malloc(strlen(aname)+1);
-    strcpy(tf->name, aname);
+    tf->name = strdup(aname);
     return 0;
 }
 
-ZapList(ah)
-struct filestr **ah; {
-    register struct filestr *tf, *nf;
-    for(tf = *ah; tf; tf=nf) {
-       nf = tf->next;      /* save before freeing */
+int
+ZapList(struct filestr **ah)
+{
+    struct filestr *tf, *nf;
+    for (tf = *ah; tf; tf = nf) {
+       nf = tf->next;          /* save before freeing */
        free(tf->name);
        free(tf);
     }
-    *ah = (struct filestr *) 0;
+    *ah = NULL;
     return 0;
 }
-
-/* StringToLevel - converts the name of an rxkad security level to a integer
- * suitable for calling rxkad_New*SecurityObject. */
-
-rxkad_level StringToLevel (name)
-  char *name;
-{
-    if (strcmp (name, "clear") == 0) return rxkad_clear;
-    if (strcmp (name, "auth") == 0) return rxkad_auth;
-    if (strcmp (name, "crypt") == 0) return rxkad_crypt;
-    return -1;
-}