git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix dbuf_dirty_record_t leaks
[zfs.git]
/
cmd
/
zpool
/
zpool_main.c
diff --git
a/cmd/zpool/zpool_main.c
b/cmd/zpool/zpool_main.c
index
4fe14c8
..
fa16836
100644
(file)
--- a/
cmd/zpool/zpool_main.c
+++ b/
cmd/zpool/zpool_main.c
@@
-2202,7
+2202,7
@@
get_interval_count(int *argcp, char **argv, unsigned long *iv,
unsigned long *cnt)
{
unsigned long interval = 0, count = 0;
unsigned long *cnt)
{
unsigned long interval = 0, count = 0;
- int argc = *argcp
, errno
;
+ int argc = *argcp;
/*
* Determine if the last argument is an integer or a pool name
/*
* Determine if the last argument is an integer or a pool name
@@
-3269,7
+3269,7
@@
print_scan_status(pool_scan_stat_t *ps)
*/
if (ps->pss_state == DSS_FINISHED) {
uint64_t minutes_taken = (end - start) / 60;
*/
if (ps->pss_state == DSS_FINISHED) {
uint64_t minutes_taken = (end - start) / 60;
- char *fmt;
+ char *fmt
= NULL
;
if (ps->pss_func == POOL_SCAN_SCRUB) {
fmt = gettext("scrub repaired %s in %lluh%um with "
if (ps->pss_func == POOL_SCAN_SCRUB) {
fmt = gettext("scrub repaired %s in %lluh%um with "
@@
-4392,7
+4392,7
@@
int
main(int argc, char **argv)
{
int ret;
main(int argc, char **argv)
{
int ret;
- int i;
+ int i
= 0
;
char *cmdname;
(void) setlocale(LC_ALL, "");
char *cmdname;
(void) setlocale(LC_ALL, "");
@@
-4450,6
+4450,7
@@
main(int argc, char **argv)
(void) fprintf(stderr, gettext("unrecognized "
"command '%s'\n"), cmdname);
usage(B_FALSE);
(void) fprintf(stderr, gettext("unrecognized "
"command '%s'\n"), cmdname);
usage(B_FALSE);
+ ret = 1;
}
libzfs_fini(g_zfs);
}
libzfs_fini(g_zfs);