From patchwork Fri Dec 28 03:30:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10744141 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C55DE1580 for ; Fri, 28 Dec 2018 03:43:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B812328C94 for ; Fri, 28 Dec 2018 03:43:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC42D28C99; Fri, 28 Dec 2018 03:43:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 641CC28C94 for ; Fri, 28 Dec 2018 03:43:10 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 318F1211A2060; Thu, 27 Dec 2018 19:43:10 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.126; helo=mga18.intel.com; envelope-from=dan.j.williams@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5A6EA2119EF2B for ; Thu, 27 Dec 2018 19:43:08 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Dec 2018 19:43:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,407,1539673200"; d="scan'208";a="131182584" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by fmsmga004.fm.intel.com with ESMTP; 27 Dec 2018 19:43:07 -0800 Subject: [ndctl PATCH 6/7] ndctl/monitor: Drop vasprintf usage From: Dan Williams To: linux-nvdimm@lists.01.org Date: Thu, 27 Dec 2018 19:30:31 -0800 Message-ID: <154596783052.164521.17128650712423131724.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <154596779833.164521.12632457592535372923.stgit@dwillia2-desk3.amr.corp.intel.com> References: <154596779833.164521.12632457592535372923.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-2-gc94f MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP Clean up some unnecessary buffer allocations for printing, when vfprintf() and vsyslog() can be used directly. Cc: QI Fuli Signed-off-by: Dan Williams --- ndctl/monitor.c | 43 ++++++++----------------------------------- 1 file changed, 8 insertions(+), 35 deletions(-) diff --git a/ndctl/monitor.c b/ndctl/monitor.c index 8a16c9664e0a..e38a570fe960 100644 --- a/ndctl/monitor.c +++ b/ndctl/monitor.c @@ -49,60 +49,33 @@ do { \ static void log_syslog(struct ndctl_ctx *ctx, int priority, const char *file, int line, const char *fn, const char *format, va_list args) { - char *buf; - - if (vasprintf(&buf, format, args) < 0) { - fail("vasprintf error\n"); - return; - } - syslog(priority, "%s", buf); - - free(buf); - return; + vsyslog(priority, format, args); } static void log_standard(struct ndctl_ctx *ctx, int priority, const char *file, int line, const char *fn, const char *format, va_list args) { - char *buf; - - if (vasprintf(&buf, format, args) < 0) { - fail("vasprintf error\n"); - return; - } - if (priority == 6) - fprintf(stdout, "%s", buf); + vfprintf(stdout, format, args); else - fprintf(stderr, "%s", buf); - - free(buf); - return; + vfprintf(stderr, format, args); } static void log_file(struct ndctl_ctx *ctx, int priority, const char *file, int line, const char *fn, const char *format, va_list args) { FILE *f = monitor.log_file; - char *buf; - struct timespec ts; - char timestamp[32]; - - if (vasprintf(&buf, format, args) < 0) { - fail("vasprintf error\n"); - return; - } if (priority != LOG_NOTICE) { + struct timespec ts; + clock_gettime(CLOCK_REALTIME, &ts); - sprintf(timestamp, "%10ld.%09ld", ts.tv_sec, ts.tv_nsec); - fprintf(f, "[%s] [%d] %s", timestamp, getpid(), buf); + fprintf(f, "[%10ld.%09ld] [%d] ", ts.tv_sec, ts.tv_nsec, getpid()); + vfprintf(f, format, args); } else - fprintf(f, "%s", buf); + vfprintf(f, format, args); fflush(f); - free(buf); - return; } static struct json_object *dimm_event_to_json(struct monitor_dimm *mdimm)