From patchwork Thu Jun 2 08:06:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Satoru Takeuchi X-Patchwork-Id: 9149477 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 EC6F76074E for ; Thu, 2 Jun 2016 08:06:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDD3F25EF7 for ; Thu, 2 Jun 2016 08:06:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D26552823E; Thu, 2 Jun 2016 08:06:58 +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 vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6232C25EF7 for ; Thu, 2 Jun 2016 08:06:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932152AbcFBIGx (ORCPT ); Thu, 2 Jun 2016 04:06:53 -0400 Received: from mgwkm03.jp.fujitsu.com ([202.219.69.170]:32986 "EHLO mgwkm03.jp.fujitsu.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752099AbcFBIGv (ORCPT ); Thu, 2 Jun 2016 04:06:51 -0400 Received: from kw-mxoi1.gw.nic.fujitsu.com (unknown [192.168.231.131]) by mgwkm03.jp.fujitsu.com with smtp id 02ed_3047_4829533f_5502_4b5d_8e1c_7ccededce2de; Thu, 02 Jun 2016 17:06:47 +0900 Received: from m3050.s.css.fujitsu.com (msm.b.css.fujitsu.com [10.134.21.208]) by kw-mxoi1.gw.nic.fujitsu.com (Postfix) with ESMTP id 48E1BAC01DF for ; Thu, 2 Jun 2016 17:06:45 +0900 (JST) X-SecurityPolicyCheck: OK by SHieldMailChecker v2.4.6 X-SHieldMailCheckerPolicyVersion: FJ-ISEC-20160122 X-SHieldMailCheckerMailID: b5e234d826ab4a1da38624c01d893855 To: "linux-btrfs@vger.kernel.org" From: Satoru Takeuchi Subject: [PATCH 1/5] btrfs-progs: btrfs-crc: fix build error Message-ID: <08faf8d3-0cc4-5164-b583-f69c8c3eb5bc@jp.fujitsu.com> Date: Thu, 2 Jun 2016 17:06:37 +0900 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.1.0 MIME-Version: 1.0 X-TM-AS-MML: disable Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove the following build error. ==================================== $ make btrfs-crc [CC] btrfs-crc.o [LD] btrfs-crc btrfs-crc.o: In function `usage': /home/sat/src/btrfs-progs/btrfs-crc.c:26: multiple definition of `usage' help.o:/home/sat/src/btrfs-progs/help.c:125: first defined here collect2: error: ld returned 1 exit status Makefile:294: recipe for target 'btrfs-crc' failed make: *** [btrfs-crc] Error 1 ===================================== Signed-off-by: Satoru Takeuchi --- btrfs-crc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/btrfs-crc.c b/btrfs-crc.c index 723e0b7..86dfe05 100644 --- a/btrfs-crc.c +++ b/btrfs-crc.c @@ -22,7 +22,7 @@ #include "crc32c.h" #include "utils.h" -void usage(void) +void print_usage(void) { printf("usage: btrfs-crc filename\n"); printf(" print out the btrfs crc for \"filename\"\n"); @@ -57,7 +57,7 @@ int main(int argc, char **argv) seed = atol(optarg); break; case 'h': - usage(); + print_usage(); case '?': return 255; }