RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-04 23:29:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

mkfs.btrfs: Fix compilation errors with gcc 4.6

Browse Source 
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>
This commit is contained in:
Hugo Mills 2011-06-26 19:41:18 +01:00 committed by Chris Mason
parent 796a0e9cc4
commit acee5809c1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mkfs.c
View File

@ -750,7 +750,7 @@ static int add_file_items(struct btrfs_trans_handle *trans,
ino_t parent_inum, struct stat *st, ino_t parent_inum, struct stat *st,
const char *path_name, int out_fd) const char *path_name, int out_fd)
{ {
int ret; int ret = -1;
ssize_t ret_read; ssize_t ret_read;
u64 bytes_read = 0; u64 bytes_read = 0;
char *buffer = NULL; 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); ret = btrfs_lookup_inode(trans, root, &path, &root_dir_key, 1);
if (ret) { if (ret) {
fprintf(stderr, "root dir lookup error\n"); fprintf(stderr, "root dir lookup error\n");
goto fail; return -1;
} }
leaf = path.nodes[0]; leaf = path.nodes[0];
@ -913,7 +913,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
if (chdir(parent_dir_entry->path)) { if (chdir(parent_dir_entry->path)) {
fprintf(stderr, "chdir error for %s\n", fprintf(stderr, "chdir error for %s\n",
parent_dir_name); parent_dir_name);
goto fail; goto fail_no_files;
} }
count = scandir(parent_dir_entry->path, &files, count = scandir(parent_dir_entry->path, &files,
@ -996,6 +996,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
return 0; return 0;
fail: fail:
free_namelist(files, count); free_namelist(files, count);
fail_no_files:
free(parent_dir_entry->path); free(parent_dir_entry->path);
free(parent_dir_entry); free(parent_dir_entry);
return -1; return -1;