From 777d395feaa082a69e32d985bbc1cca3d3dad077 Mon Sep 17 00:00:00 2001 From: Avra Sengupta Date: Wed, 21 Nov 2012 14:07:05 +0530 Subject: core: fixes for gcc's '-pedantic' flag build * warnings on 'void *' arguments * warnings on empty initializations * warnings on empty array (array[0]) Change-Id: Iae440f54cbd59580eb69f3ecaed5a9926c0edf95 BUG: 875913 Signed-off-by: Avra Sengupta Reviewed-on: http://review.gluster.org/4219 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- contrib/fuse-include/fuse_kernel.h | 2 +- contrib/libgen/basename_r.c | 4 ++-- contrib/libgen/dirname_r.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'contrib') diff --git a/contrib/fuse-include/fuse_kernel.h b/contrib/fuse-include/fuse_kernel.h index 9ae25d6f..e6fdcf80 100644 --- a/contrib/fuse-include/fuse_kernel.h +++ b/contrib/fuse-include/fuse_kernel.h @@ -556,7 +556,7 @@ struct fuse_dirent { __u64 off; __u32 namelen; __u32 type; - char name[0]; + char name[]; }; #define FUSE_NAME_OFFSET offsetof(struct fuse_dirent, name) diff --git a/contrib/libgen/basename_r.c b/contrib/libgen/basename_r.c index d63bce4e..2c3a87af 100644 --- a/contrib/libgen/basename_r.c +++ b/contrib/libgen/basename_r.c @@ -1,10 +1,10 @@ -#ifdef THREAD_UNSAFE_BASENAME /* - * borrowed from glibc-2.12.1/string/basename.c + * borrowed from glibc-2.12.1/string/basename.c * Modified to return "." for NULL or "", as required for SUSv2. */ #include #include +#ifdef THREAD_UNSAFE_BASENAME /* Return the name-within-directory of a file name. Copyright (C) 1996,97,98,2002 Free Software Foundation, Inc. diff --git a/contrib/libgen/dirname_r.c b/contrib/libgen/dirname_r.c index 02981f5e..131cbcf2 100644 --- a/contrib/libgen/dirname_r.c +++ b/contrib/libgen/dirname_r.c @@ -1,4 +1,3 @@ -#ifdef THREAD_UNSAFE_DIRNAME /* * Borrowed from glibc-2.12.1/string/memrchr.c * Based on strlen implementation by Torbjorn Granlund (tege@sics.se), @@ -7,6 +6,7 @@ */ #include #include +#ifdef THREAD_UNSAFE_DIRNAME /* memrchr -- find the last occurrence of a byte in a memory block Copyright (C) 1991, 93, 96, 97, 99, 2000 Free Software Foundation, Inc. -- cgit