41 lines
989 B
Diff
41 lines
989 B
Diff
Index: smf-init/usr/src/cmd/halt/halt.c
|
|
===================================================================
|
|
--- smf-init.orig/usr/src/cmd/halt/halt.c
|
|
+++ smf-init/usr/src/cmd/halt/halt.c
|
|
@@ -462,7 +462,7 @@ halt_zones()
|
|
{
|
|
pid_t pid;
|
|
zoneid_t *zones;
|
|
- size_t nz = 0, old_nz;
|
|
+ uint_t nz = 0, old_nz;
|
|
int i;
|
|
char zname[ZONENAME_MAX];
|
|
|
|
@@ -548,7 +548,7 @@ static void
|
|
check_zones_haltedness()
|
|
{
|
|
int t = 0, t_prog = 0;
|
|
- size_t nz = 0, last_nz;
|
|
+ uint_t nz = 0, last_nz;
|
|
|
|
do {
|
|
last_nz = nz;
|
|
@@ -1205,7 +1205,7 @@ main(int argc, char *argv[])
|
|
int qflag = 0, needlog = 1, nosync = 0;
|
|
int fast_reboot = 0;
|
|
int prom_reboot = 0;
|
|
- uintptr_t mdep = NULL;
|
|
+ uintptr_t mdep = 0;
|
|
int cmd, fcn, c, aval, r;
|
|
const char *usage;
|
|
const char *optstring;
|
|
@@ -1558,7 +1558,7 @@ main(int argc, char *argv[])
|
|
}
|
|
|
|
if (cmd == A_DUMP && nosync != 0)
|
|
- (void) uadmin(A_DUMP, AD_NOSYNC, NULL);
|
|
+ (void) uadmin(A_DUMP, AD_NOSYNC, 0);
|
|
|
|
if (fast_reboot)
|
|
fcn = AD_FASTREBOOT;
|