From 9ccfe0fa5a43dfc4453b09e328565a6c8f999fe4 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Tue, 24 Nov 2009 08:36:20 -0500 Subject: statd: Replace note() with xlog() in rpc.statd To facilitate code sharing between statd and sm-notify (and with other components of nfs-utils), replace sm-notify's nsm_log() with xlog(). Since opt_quiet is used in only a handful of insignificant cases, it is removed. Signed-off-by: Chuck Lever Signed-off-by: Steve Dickson --- utils/statd/misc.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'utils/statd/misc.c') diff --git a/utils/statd/misc.c b/utils/statd/misc.c index 7256291..44af30e 100644 --- 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); } -- cgit