statd: Replace note() with xlog() in rpc.statd

[nfs-utils.git] / utils / statd / misc.c

diff --git a/utils/statd/misc.c b/utils/statd/misc.c
index 725629116a2228be0fdb013c623e4f1426f31a6a..44af30eea07ef8ccf7d4f9990c5ed18540c66041 100644 (file)
--- a/utils/statd/misc.c
+++ b/utils/statd/misc.c
@@ -29,8 +29,7 @@ xmalloc (size_t size)
     return ((void *)NULL);
 
   if (!(ptr = malloc (size)))
-    /* SHIT!  SHIT!  SHIT! */
-    die ("malloc failed");
+    xlog_err ("malloc failed");
 
   return (ptr);
 }
@@ -46,7 +45,7 @@ xstrdup (const char *string)
 
   /* Will only fail if underlying malloc() fails (ENOMEM). */
   if (!(result = strdup (string)))
-    die ("strdup failed");
+    xlog_err ("strdup failed");
 
   return (result);
 }
@@ -62,16 +61,15 @@ xunlink (char *path, char *host)
 
        tozap = malloc(strlen(path)+strlen(host)+2);
        if (tozap == NULL) {
-               note(N_ERROR, "xunlink: malloc failed: errno %d (%s)", 
-                       errno, strerror(errno));
+               xlog(L_ERROR, "xunlink: malloc failed: errno %d (%m)", errno);
                return;
        }
        sprintf (tozap, "%s/%s", path, host);
 
        if (unlink (tozap) == -1)
-               note(N_ERROR, "unlink (%s): %s", tozap, strerror (errno));
+               xlog(L_ERROR, "unlink (%s): %m", tozap);
        else
-               dprintf (N_DEBUG, "Unlinked %s", tozap);
+               xlog(D_GENERAL, "Unlinked %s", tozap);
 
        free(tozap);
 }