Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 

Conflicts:

	cmd/zfs/zfs_main.c
This commit is contained in:
Brian Behlendorf 2009-10-23 12:25:33 -07:00
parent a9db62de88 8d3be9d6b8
commit a56b8d337f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zfs/zfs_main.c
View File

@ -4056,7 +4056,7 @@ int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int ret; int ret;
int i; int i = 0;
#ifdef HAVE_ZPL #ifdef HAVE_ZPL
char *progname; char *progname;
#endif #endif

2
cmd/zpool/zpool_main.c
View File

@ -3922,7 +3922,7 @@ int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int ret; int ret;
int i; int i = 0;
char *cmdname; char *cmdname;
(void) setlocale(LC_ALL, ""); (void) setlocale(LC_ALL, "");