mirror of https://github.com/vitalif/e2fsprogs
Eliminate unused variable and unused label warnings from Android build
Signed-off-by: Theodore Ts'o <tytso@mit.edu>debian
parent
25f291c9b3
commit
cf491d3a64
|
@ -181,7 +181,6 @@ int e2fsck_pass1_check_symlink(ext2_filsys fs, ext2_ino_t ino,
|
||||||
ext2_extent_handle_t handle;
|
ext2_extent_handle_t handle;
|
||||||
struct ext2_extent_info info;
|
struct ext2_extent_info info;
|
||||||
struct ext2fs_extent extent;
|
struct ext2fs_extent extent;
|
||||||
int encrypted = 0;
|
|
||||||
|
|
||||||
if ((inode->i_size_high || inode->i_size == 0) ||
|
if ((inode->i_size_high || inode->i_size == 0) ||
|
||||||
(inode->i_flags & EXT2_INDEX_FL))
|
(inode->i_flags & EXT2_INDEX_FL))
|
||||||
|
|
|
@ -334,8 +334,6 @@ static const char *lookup_table_fallback(int num, struct str_table *table)
|
||||||
static void die_signal_handler(int signum, siginfo_t *siginfo,
|
static void die_signal_handler(int signum, siginfo_t *siginfo,
|
||||||
void *context EXT2FS_ATTR((unused)))
|
void *context EXT2FS_ATTR((unused)))
|
||||||
{
|
{
|
||||||
void *stack_syms[32];
|
|
||||||
int frames;
|
|
||||||
const char *cp;
|
const char *cp;
|
||||||
|
|
||||||
fprintf(stderr, "Signal (%d) %s ", signum,
|
fprintf(stderr, "Signal (%d) %s ", signum,
|
||||||
|
@ -374,8 +372,13 @@ static void die_signal_handler(int signum, siginfo_t *siginfo,
|
||||||
fprintf(stderr, "\n");
|
fprintf(stderr, "\n");
|
||||||
|
|
||||||
#if defined(HAVE_BACKTRACE) && !defined(DISABLE_BACKTRACE)
|
#if defined(HAVE_BACKTRACE) && !defined(DISABLE_BACKTRACE)
|
||||||
frames = backtrace(stack_syms, 32);
|
{
|
||||||
backtrace_symbols_fd(stack_syms, frames, 2);
|
void *stack_syms[32];
|
||||||
|
int frames;
|
||||||
|
|
||||||
|
frames = backtrace(stack_syms, 32);
|
||||||
|
backtrace_symbols_fd(stack_syms, frames, 2);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
exit(FSCK_ERROR);
|
exit(FSCK_ERROR);
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,19 +45,16 @@
|
||||||
errcode_t ext2fs_get_memalign(unsigned long size,
|
errcode_t ext2fs_get_memalign(unsigned long size,
|
||||||
unsigned long align, void *ptr)
|
unsigned long align, void *ptr)
|
||||||
{
|
{
|
||||||
errcode_t retval;
|
errcode_t retval = 0;
|
||||||
void **p = ptr;
|
void **p = ptr;
|
||||||
|
|
||||||
if (align < 8)
|
if (align < 8)
|
||||||
align = 8;
|
align = 8;
|
||||||
#ifdef HAVE_POSIX_MEMALIGN
|
#ifdef HAVE_POSIX_MEMALIGN
|
||||||
retval = posix_memalign(p, align, size);
|
retval = posix_memalign(p, align, size);
|
||||||
if (retval) {
|
if (retval == ENOMEM)
|
||||||
if (retval == ENOMEM)
|
return EXT2_ET_NO_MEMORY;
|
||||||
return EXT2_ET_NO_MEMORY;
|
#else /* !HAVE_POSIX_MEMALIGN */
|
||||||
return retval;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
#ifdef HAVE_MEMALIGN
|
#ifdef HAVE_MEMALIGN
|
||||||
*p = memalign(align, size);
|
*p = memalign(align, size);
|
||||||
if (*p == NULL) {
|
if (*p == NULL) {
|
||||||
|
@ -66,7 +63,7 @@ errcode_t ext2fs_get_memalign(unsigned long size,
|
||||||
else
|
else
|
||||||
return EXT2_ET_NO_MEMORY;
|
return EXT2_ET_NO_MEMORY;
|
||||||
}
|
}
|
||||||
#else
|
#else /* !HAVE_MEMALIGN */
|
||||||
#ifdef HAVE_VALLOC
|
#ifdef HAVE_VALLOC
|
||||||
if (align > sizeof(long long))
|
if (align > sizeof(long long))
|
||||||
*p = valloc(size);
|
*p = valloc(size);
|
||||||
|
@ -79,9 +76,9 @@ errcode_t ext2fs_get_memalign(unsigned long size,
|
||||||
}
|
}
|
||||||
if (*p == 0)
|
if (*p == 0)
|
||||||
return EXT2_ET_NO_MEMORY;
|
return EXT2_ET_NO_MEMORY;
|
||||||
#endif
|
#endif /* HAVE_MEMALIGN */
|
||||||
#endif
|
#endif /* HAVE_POSIX_MEMALIGN */
|
||||||
return 0;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
|
|
|
@ -1012,15 +1012,13 @@ static errcode_t unix_zeroout(io_channel channel, unsigned long long block,
|
||||||
goto unimplemented;
|
goto unimplemented;
|
||||||
} else {
|
} else {
|
||||||
/* Regular file, try to use truncate/punch/zero. */
|
/* Regular file, try to use truncate/punch/zero. */
|
||||||
#if defined(HAVE_FALLOCATE) && (defined(FALLOC_FL_ZERO_RANGE) || \
|
|
||||||
(defined(FALLOC_FL_PUNCH_HOLE) && defined(FALLOC_FL_KEEP_SIZE)))
|
|
||||||
struct stat statbuf;
|
struct stat statbuf;
|
||||||
|
|
||||||
if (count == 0)
|
if (count == 0)
|
||||||
return 0;
|
return 0;
|
||||||
/*
|
/*
|
||||||
* If we're trying to zero a range past the end of the file,
|
* If we're trying to zero a range past the end of the file,
|
||||||
* extend the file size, then punch (or zero_range) everything.
|
* extend the file size, then truncate everything.
|
||||||
*/
|
*/
|
||||||
ret = fstat(data->dev, &statbuf);
|
ret = fstat(data->dev, &statbuf);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
@ -1031,6 +1029,8 @@ static errcode_t unix_zeroout(io_channel channel, unsigned long long block,
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
|
#if defined(HAVE_FALLOCATE) && (defined(FALLOC_FL_ZERO_RANGE) || \
|
||||||
|
(defined(FALLOC_FL_PUNCH_HOLE) && defined(FALLOC_FL_KEEP_SIZE)))
|
||||||
#if defined(FALLOC_FL_PUNCH_HOLE) && defined(FALLOC_FL_KEEP_SIZE)
|
#if defined(FALLOC_FL_PUNCH_HOLE) && defined(FALLOC_FL_KEEP_SIZE)
|
||||||
ret = fallocate(data->dev,
|
ret = fallocate(data->dev,
|
||||||
FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
|
FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
|
||||||
|
|
|
@ -16,8 +16,5 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include "ss_internal.h"
|
#include "ss_internal.h"
|
||||||
|
|
||||||
static const char copyright[] =
|
|
||||||
"Copyright 1987, 1988, 1989 by the Massachusetts Institute of Technology";
|
|
||||||
|
|
||||||
ss_data **_ss_table = (ss_data **)NULL;
|
ss_data **_ss_table = (ss_data **)NULL;
|
||||||
char *_ss_pager_name = (char *)NULL;
|
char *_ss_pager_name = (char *)NULL;
|
||||||
|
|
|
@ -274,8 +274,7 @@ static void parse_salt(char *salt_str, int flags)
|
||||||
{
|
{
|
||||||
unsigned char buf[EXT4_MAX_SALT_SIZE];
|
unsigned char buf[EXT4_MAX_SALT_SIZE];
|
||||||
unsigned char *salt_buf, *cp = salt_str;
|
unsigned char *salt_buf, *cp = salt_str;
|
||||||
char tmp[80];
|
int fd, ret, salt_len = 0;
|
||||||
int i, fd, ret, salt_len = 0;
|
|
||||||
|
|
||||||
if (flags & PARSE_FLAGS_FORCE_FN)
|
if (flags & PARSE_FLAGS_FORCE_FN)
|
||||||
goto salt_from_filename;
|
goto salt_from_filename;
|
||||||
|
@ -706,11 +705,8 @@ void do_add_key(int argc, char **argv, const struct cmd_desc *cmd)
|
||||||
|
|
||||||
void do_set_policy(int argc, char **argv, const struct cmd_desc *cmd)
|
void do_set_policy(int argc, char **argv, const struct cmd_desc *cmd)
|
||||||
{
|
{
|
||||||
struct salt *salt, saltbuf;
|
struct salt saltbuf;
|
||||||
char *key_ref_str = NULL;
|
int c, pad = 4;
|
||||||
char *keyring = NULL;
|
|
||||||
int add_passphrase = 0;
|
|
||||||
int i, c, opt, pad = 4;
|
|
||||||
|
|
||||||
while ((c = getopt (argc, argv, "p:")) != EOF) {
|
while ((c = getopt (argc, argv, "p:")) != EOF) {
|
||||||
switch (c) {
|
switch (c) {
|
||||||
|
|
|
@ -10,8 +10,10 @@
|
||||||
#define HAVE_DIRENT_H 1
|
#define HAVE_DIRENT_H 1
|
||||||
#define HAVE_ERRNO_H 1
|
#define HAVE_ERRNO_H 1
|
||||||
#define HAVE_EXT2_IOCTLS 1
|
#define HAVE_EXT2_IOCTLS 1
|
||||||
|
#define HAVE_FALLOCATE 1
|
||||||
#define HAVE_GETOPT_H 1
|
#define HAVE_GETOPT_H 1
|
||||||
#define HAVE_GETPAGESIZE 1
|
#define HAVE_GETPAGESIZE 1
|
||||||
|
#define HAVE_GETPWUID_R 1
|
||||||
#define HAVE_INTPTR_T 1
|
#define HAVE_INTPTR_T 1
|
||||||
#define HAVE_INTTYPES_H 1
|
#define HAVE_INTTYPES_H 1
|
||||||
#define HAVE_LINUX_FD_H 1
|
#define HAVE_LINUX_FD_H 1
|
||||||
|
@ -20,11 +22,14 @@
|
||||||
#define HAVE_MMAP 1
|
#define HAVE_MMAP 1
|
||||||
#define HAVE_NETINET_IN_H 1
|
#define HAVE_NETINET_IN_H 1
|
||||||
#define HAVE_NET_IF_H 1
|
#define HAVE_NET_IF_H 1
|
||||||
|
#define HAVE_POSIX_MEMALIGN 1
|
||||||
#define HAVE_SETJMP_H 1
|
#define HAVE_SETJMP_H 1
|
||||||
#define HAVE_SNPRINTF 1
|
#define HAVE_SNPRINTF 1
|
||||||
#define HAVE_STDLIB_H 1
|
#define HAVE_STDLIB_H 1
|
||||||
#define HAVE_STRCASECMP 1
|
#define HAVE_STRCASECMP 1
|
||||||
#define HAVE_STRDUP 1
|
#define HAVE_STRDUP 1
|
||||||
|
#define HAVE_STRINGS_H 1
|
||||||
|
#define HAVE_STRPTIME 1
|
||||||
#define HAVE_SYSCONF 1
|
#define HAVE_SYSCONF 1
|
||||||
#define HAVE_SYS_IOCTL_H 1
|
#define HAVE_SYS_IOCTL_H 1
|
||||||
#define HAVE_SYS_MMAN_H 1
|
#define HAVE_SYS_MMAN_H 1
|
||||||
|
|
Loading…
Reference in New Issue