| Message ID | 08faf8d3-0cc4-5164-b583-f69c8c3eb5bc@jp.fujitsu.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Jun 02, 2016 at 05:06:37PM +0900, Satoru Takeuchi wrote: > 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 <takeuchi_satoru@jp.fujitsu.com> 1-5 applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; }
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 <takeuchi_satoru@jp.fujitsu.com> --- btrfs-crc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)