From patchwork Thu Sep 15 14:24:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Kurz X-Patchwork-Id: 9333801 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 24A196077A for ; Thu, 15 Sep 2016 14:39:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1852729852 for ; Thu, 15 Sep 2016 14:39:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D088298C0; Thu, 15 Sep 2016 14:39:41 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1C642298BF for ; Thu, 15 Sep 2016 14:39:37 +0000 (UTC) Received: from localhost ([::1]:35185 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkXp9-0002UR-OK for patchwork-qemu-devel@patchwork.kernel.org; Thu, 15 Sep 2016 10:39:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkXaa-0007JA-Of for qemu-devel@nongnu.org; Thu, 15 Sep 2016 10:24:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkXaU-0001wg-Na for qemu-devel@nongnu.org; Thu, 15 Sep 2016 10:24:31 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:52363) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkXaU-0001wQ-Eo for qemu-devel@nongnu.org; Thu, 15 Sep 2016 10:24:26 -0400 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u8FEO3cW002422 for ; Thu, 15 Sep 2016 10:24:25 -0400 Received: from e35.co.us.ibm.com (e35.co.us.ibm.com [32.97.110.153]) by mx0a-001b2d01.pphosted.com with ESMTP id 25fpy8vsja-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 15 Sep 2016 10:24:25 -0400 Received: from localhost by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 15 Sep 2016 08:24:23 -0600 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e35.co.us.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 15 Sep 2016 08:24:22 -0600 X-IBM-Helo: d03dlp03.boulder.ibm.com X-IBM-MailFrom: groug@kaod.org Received: from b03cxnp08026.gho.boulder.ibm.com (b03cxnp08026.gho.boulder.ibm.com [9.17.130.18]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 47CF319D8040; Thu, 15 Sep 2016 08:23:51 -0600 (MDT) Received: from b03ledav003.gho.boulder.ibm.com (b03ledav003.gho.boulder.ibm.com [9.17.130.234]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u8FEOLWB5177752; Thu, 15 Sep 2016 07:24:21 -0700 Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7C1C66A043; Thu, 15 Sep 2016 08:24:21 -0600 (MDT) Received: from [192.168.66.108] (unknown [9.164.164.67]) by b03ledav003.gho.boulder.ibm.com (Postfix) with ESMTP id 903586A03F; Thu, 15 Sep 2016 08:24:20 -0600 (MDT) From: Greg Kurz To: qemu-devel@nongnu.org Date: Thu, 15 Sep 2016 16:24:19 +0200 In-Reply-To: <147394943723.684.13967719989878111420.stgit@bahia> References: <147394943723.684.13967719989878111420.stgit@bahia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16091514-0012-0000-0000-000010A444AD X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00005765; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000185; SDB=6.00757975; UDB=6.00359635; IPR=6.00531588; BA=6.00004731; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00012682; XFM=3.00000011; UTC=2016-09-15 14:24:23 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16091514-0013-0000-0000-0000457CB84A Message-Id: <147394945935.684.4901814937936629234.stgit@bahia> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-09-15_08:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609020000 definitions=main-1609150194 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH 3/4] 9pfs: drop useless v9fs_string_null() function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Greg Kurz , "Aneesh Kumar K.V" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The v9fs_string_null() function just calls v9fs_string_free(). Also it only has 4 users, whereas v9fs_string_free() has 87. This patch converts users to call directly v9fs_string_free() and drops the useless function. Signed-off-by: Greg Kurz Reviewed-by: Cédric Le Goater --- fsdev/9p-marshal.c | 5 ----- fsdev/9p-marshal.h | 1 - hw/9pfs/9p.c | 8 ++++---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/fsdev/9p-marshal.c b/fsdev/9p-marshal.c index 238dbf21b1d5..a01bba6908a8 100644 --- a/fsdev/9p-marshal.c +++ b/fsdev/9p-marshal.c @@ -23,15 +23,10 @@ void v9fs_string_free(V9fsString *str) g_free(str->data); str->data = NULL; str->size = 0; } -void v9fs_string_null(V9fsString *str) -{ - v9fs_string_free(str); -} - void GCC_FMT_ATTR(2, 3) v9fs_string_sprintf(V9fsString *str, const char *fmt, ...) { va_list ap; diff --git a/fsdev/9p-marshal.h b/fsdev/9p-marshal.h index 140db6d99f9c..77f7fef326ee 100644 --- a/fsdev/9p-marshal.h +++ b/fsdev/9p-marshal.h @@ -75,10 +75,9 @@ static inline void v9fs_string_init(V9fsString *str) { str->data = NULL; str->size = 0; } extern void v9fs_string_free(V9fsString *str); -extern void v9fs_string_null(V9fsString *str); extern void v9fs_string_sprintf(V9fsString *str, const char *fmt, ...); extern void v9fs_string_copy(V9fsString *lhs, V9fsString *rhs); #endif diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index dfe293d11d1c..d8f48ca76c47 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -808,19 +808,19 @@ static int stat_to_v9stat(V9fsPDU *pdu, V9fsPath *name, v9stat->mode = stat_to_v9mode(stbuf); v9stat->atime = stbuf->st_atime; v9stat->mtime = stbuf->st_mtime; v9stat->length = stbuf->st_size; - v9fs_string_null(&v9stat->uid); - v9fs_string_null(&v9stat->gid); - v9fs_string_null(&v9stat->muid); + v9fs_string_free(&v9stat->uid); + v9fs_string_free(&v9stat->gid); + v9fs_string_free(&v9stat->muid); v9stat->n_uid = stbuf->st_uid; v9stat->n_gid = stbuf->st_gid; v9stat->n_muid = 0; - v9fs_string_null(&v9stat->extension); + v9fs_string_free(&v9stat->extension); if (v9stat->mode & P9_STAT_MODE_SYMLINK) { err = v9fs_co_readlink(pdu, name, &v9stat->extension); if (err < 0) { return err;