171 |
|
char *value; |
172 |
|
int instance; |
173 |
|
if ((root_node = di_init("/", DINFOCPYALL)) == DI_NODE_NIL) { |
174 |
< |
return 1; |
174 |
> |
return -1; |
175 |
|
} |
176 |
|
node = di_drv_first_node(alias, root_node); |
177 |
|
while (node != DI_NODE_NIL) { |
213 |
|
int found; |
214 |
|
|
215 |
|
if ((kc = kstat_open()) == NULL) { |
216 |
< |
return 1; |
216 |
> |
return -1; |
217 |
|
} |
218 |
|
|
219 |
|
for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) { |
235 |
|
if (x>=BIG_ENOUGH){ |
236 |
|
/* We've got bigger than we thought was massive */ |
237 |
|
/* If we hit this.. Make big enough bigger */ |
238 |
< |
return 1; |
238 |
> |
return -1; |
239 |
|
} |
240 |
|
if( !strncmp(driver_list[x], device_name, BIG_ENOUGH)){ |
241 |
|
found = 1; |
245 |
|
|
246 |
|
if(!found){ |
247 |
|
if((get_alias(device_name)) != 0){ |
248 |
< |
return 1; |
248 |
> |
return -1; |
249 |
|
} |
250 |
|
strncpy(driver_list[x], device_name, BIG_ENOUGH); |
251 |
|
list_entries++; |
461 |
|
#if defined(NETBSD) || defined(OPENBSD) |
462 |
|
struct uvmexp *sg_get_uvmexp() { |
463 |
|
int mib[2]; |
464 |
< |
size_t size; |
465 |
< |
static struct uvmexp *uvm = NULL; |
464 |
> |
size_t size = sizeof(struct uvmexp); |
465 |
> |
static struct uvmexp uvm; |
466 |
|
struct uvmexp *new; |
467 |
|
|
468 |
|
mib[0] = CTL_VM; |
469 |
|
mib[1] = VM_UVMEXP; |
470 |
|
|
471 |
< |
if (sysctl(mib, 2, NULL, &size, NULL, 0) < 0) { |
471 |
> |
if (sysctl(mib, 2, &uvm, &size, NULL, 0) < 0) { |
472 |
|
return NULL; |
473 |
|
} |
474 |
|
|
475 |
< |
new = realloc(uvm, size); |
476 |
< |
if (new == NULL) { |
477 |
< |
return NULL; |
478 |
< |
} |
479 |
< |
uvm = new; |
480 |
< |
|
481 |
< |
if (sysctl(mib, 2, uvm, &size, NULL, 0) < 0) { |
482 |
< |
return NULL; |
483 |
< |
} |
484 |
< |
|
485 |
< |
return uvm; |
475 |
> |
return &uvm; |
476 |
|
} |
477 |
|
#endif |
478 |
|
|
479 |
|
int sg_init(){ |
480 |
|
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
481 |
|
if (sg_get_kvm() == NULL) { |
482 |
< |
return 1; |
482 |
> |
return -1; |
483 |
|
} |
484 |
|
if (sg_get_kvm2() == NULL) { |
485 |
< |
return 1; |
485 |
> |
return -1; |
486 |
|
} |
497 |
– |
#endif |
498 |
– |
#if defined(NETBSD) || defined(OPENBSD) |
499 |
– |
/* This should always succeed, but it seems that on some |
500 |
– |
* versions of NetBSD the first call to get_uvmexp will return |
501 |
– |
* a non-filled-in structure; this is a workaround for that. |
502 |
– |
*/ |
503 |
– |
if (sg_get_uvmexp() == NULL) return 1; |
487 |
|
#endif |
488 |
|
#ifdef SOLARIS |
489 |
|
/* On solaris 7, this will fail if you are not root. But, everything |