From 5e8dbe1b26a6970194e9ae93ca0c04ea903e2bc3 Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Mon, 10 Dec 2007 16:59:28 +0000 Subject: Zero dentry when allocating it. Write errors to stderr, not stdout. Remove defunct code for defunct flag -D. --- plpnfsd/main.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/plpnfsd/main.cc b/plpnfsd/main.cc index 271319b..8c6533f 100644 --- a/plpnfsd/main.cc +++ b/plpnfsd/main.cc @@ -254,7 +254,7 @@ long rfsv_dir(const char *file, dentry **e) { for (int i = 0; i < entries.size(); i++) { PlpDirent pe = entries[i]; tmp = *e; - *e = (dentry *)malloc(sizeof(dentry)); + *e = (dentry *)calloc(1, sizeof(dentry)); if (!*e) return -1; (*e)->time = pe.getPsiTime().getTime(); @@ -479,7 +479,7 @@ long rfsv_drivelist(int *cnt, device **dlist) { static void help() { - cout << _( + cerr << _( "Usage: plpnfsd [OPTIONS]...\n" "\n" "Supported options:\n" @@ -564,7 +564,7 @@ int main(int argc, char**argv) { usage(); return -1; case 'V': - cout << _("plpnfsd Version ") << VERSION << endl; + cerr << _("plpnfsd Version ") << VERSION << endl; return 0; case 'h': help(); @@ -572,9 +572,6 @@ int main(int argc, char**argv) { case 'v': verbose++; break; - case 'D': - debug++; - break; case 'd': mdir = optarg; break; -- cgit v1.2.3