X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fstatd%2Fmisc.c;h=f2a086f33b2c1f9f90000d8231dbae2113b43785;hp=725629116a2228be0fdb013c623e4f1426f31a6a;hb=014e00dfaea0efc92150e2aedc5ca43aa337545e;hpb=bc870150cc2116584aee288d15ac2b9a2f825ff5 diff --git a/utils/statd/misc.c b/utils/statd/misc.c index 7256291..f2a086f 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,32 +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); } - - -/* - * Unlinking a file. - */ -void -xunlink (char *path, char *host) -{ - char *tozap; - - tozap = malloc(strlen(path)+strlen(host)+2); - if (tozap == NULL) { - note(N_ERROR, "xunlink: malloc failed: errno %d (%s)", - errno, strerror(errno)); - return; - } - sprintf (tozap, "%s/%s", path, host); - - if (unlink (tozap) == -1) - note(N_ERROR, "unlink (%s): %s", tozap, strerror (errno)); - else - dprintf (N_DEBUG, "Unlinked %s", tozap); - - free(tozap); -}