misc: fix header complaints and resource leaks in e2fsprogs

Fix a few minor bugs that cppcheck complained about.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
crypto
Darrick J. Wong 2014-03-14 09:43:11 -04:00 committed by Theodore Ts'o
parent b052dc1c8d
commit 8a6cc1aebd
4 changed files with 7 additions and 2 deletions

View File

@ -657,6 +657,7 @@ static void dump_extents(FILE *f, const char *prefix, ext2_ino_t ino,
}
if (printed)
fprintf(f, "\n");
ext2fs_extent_free(handle);
}
static void dump_inline_data(FILE *out, const char *prefix, ext2_ino_t inode_num)

View File

@ -201,7 +201,7 @@ char *time_to_string(__u32 cl)
tz = ss_safe_getenv("TZ");
if (!tz)
tz = "";
do_gmt = !strcmp(tz, "GMT") | !strcmp(tz, "GMT0");
do_gmt = !strcmp(tz, "GMT") || !strcmp(tz, "GMT0");
}
return asctime((do_gmt) ? gmtime(&t) : localtime(&t));

View File

@ -193,13 +193,14 @@ errcode_t ext2fs_create_icount_tdb(ext2_filsys fs, char *tdb_dir,
goto errout;
uuid_unparse(fs->super->s_uuid, uuid);
sprintf(fn, "%s/%s-icount-XXXXXX", tdb_dir, uuid);
icount->tdb_fn = fn;
save_umask = umask(077);
fd = mkstemp(fn);
if (fd < 0) {
retval = errno;
ext2fs_free_mem(&fn);
goto errout;
}
icount->tdb_fn = fn;
umask(save_umask);
/*
* This is an overestimate of the size that we will need; the

View File

@ -17,6 +17,9 @@
#include <fcntl.h>
#include <time.h>
#include <utime.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_GETOPT_H
#include <getopt.h>