korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-12-01 05:53:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

ext2fs: quiet compiler warnings

Browse Source 
Include ext2fsP.h in fileio.c for ext2fs_file_block_offset_too_big()
declaration.  Fix up the declaration to mark it extern in the header.

Include <strings.h> header for strcasecmp() in tune2fs.c if available,
as described in the strcasecmp(3) man page, instead of doing this
indirectly by declaring _BSD_SOURCE and getting it from <string.h>.

If CONFIG_QUOTA is undefined, parse_quota_opts() is unused in
tune2fs.c so #ifdef it out.

Signed-off-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Andreas Dilger 2013-12-15 23:26:25 -05:00 committed by Theodore Ts'o
parent dba2bbdfea
commit 269da3b806
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ext2fs/ext2fsP.h
View File

@ -142,6 +142,6 @@ extern void ext2fs_warn_bitmap32(ext2fs_generic_bitmap bitmap,const char *func);
extern int ext2fs_mem_is_zero(const char *mem, size_t len);
int ext2fs_file_block_offset_too_big(ext2_filsys fs,
struct ext2_inode *inode,
blk64_t offset);
extern int ext2fs_file_block_offset_too_big(ext2_filsys fs,
struct ext2_inode *inode,
blk64_t offset);

1
lib/ext2fs/fileio.c
View File

@ -18,6 +18,7 @@
#include "ext2_fs.h"
#include "ext2fs.h"
#include "ext2fsP.h"
struct ext2_file {
errcode_t magic;

10
misc/tune2fs.c
View File

@ -26,7 +26,6 @@
*/
#define _XOPEN_SOURCE 600 /* for inclusion of strptime() */
#define _BSD_SOURCE /* for inclusion of strcasecmp() */
#include "config.h"
#include <fcntl.h>
#include <grp.h>
@ -41,6 +40,11 @@ extern int optind;
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#ifdef HAVE_STRINGS_H
#include <strings.h> /* for strcasecmp() */
#else
#define _BSD_SOURCE /* for inclusion of strcasecmp() via <string.h> */
#endif
#include <string.h>
#include <time.h>
#include <unistd.h>
@ -765,6 +769,7 @@ static void handle_quota_options(ext2_filsys fs)
return;
}
#ifdef CONFIG_QUOTA
static void parse_quota_opts(const char *opts)
{
char *buf, *token, *next, *p;
@ -807,8 +812,7 @@ static void parse_quota_opts(const char *opts)
}
free(buf);
}
#endif
static void parse_e2label_options(int argc, char ** argv)
{