diff options
author | Hugo Mills <hugo@carfax.org.uk> | 2011-06-26 19:41:18 +0100 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2011-10-25 09:18:58 -0400 |
commit | acee5809c1eac37a61ed926f70f4f262b6966108 (patch) | |
tree | 58d90222ccfbfb21a3dacaa9a9d0909fa79ef384 | |
parent | 796a0e9cc46a0d173a7bbcbeb792ca80f00bf19e (diff) |
mkfs.btrfs: Fix compilation errors with gcc 4.6
gcc 4.6 complains about several possible use-before-initialise cases
in mkfs, and stops. Fix these by initialising one of the variables in
question, and using the correct error-handling paths for the
remainder.
Signed-off-by: Hugo Mills <hugo@carfax.org.uk>
-rw-r--r-- | mkfs.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -750,7 +750,7 @@ static int add_file_items(struct btrfs_trans_handle *trans, ino_t parent_inum, struct stat *st, const char *path_name, int out_fd) { - int ret; + int ret = -1; ssize_t ret_read; u64 bytes_read = 0; char *buffer = NULL; @@ -889,7 +889,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans, ret = btrfs_lookup_inode(trans, root, &path, &root_dir_key, 1); if (ret) { fprintf(stderr, "root dir lookup error\n"); - goto fail; + return -1; } leaf = path.nodes[0]; @@ -913,7 +913,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans, if (chdir(parent_dir_entry->path)) { fprintf(stderr, "chdir error for %s\n", parent_dir_name); - goto fail; + goto fail_no_files; } count = scandir(parent_dir_entry->path, &files, @@ -996,6 +996,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans, return 0; fail: free_namelist(files, count); +fail_no_files: free(parent_dir_entry->path); free(parent_dir_entry); return -1; |