diff options
| author | nd150628 <none@none> | 2006-10-03 15:01:10 -0700 |
|---|---|---|
| committer | nd150628 <none@none> | 2006-10-03 15:01:10 -0700 |
| commit | 5ad820458efd0fdb914baff9c1447c22b819fa23 (patch) | |
| tree | 0986cce9a68a564167dded13501576679a4b94f3 /usr/src/lib/libuutil | |
| parent | a985e5786d4eb44e83b59c9c7e38bc77e12fec47 (diff) | |
| download | illumos-gate-5ad820458efd0fdb914baff9c1447c22b819fa23.tar.gz | |
6463348 ZFS code could be more portable
Diffstat (limited to 'usr/src/lib/libuutil')
| -rw-r--r-- | usr/src/lib/libuutil/common/uu_avl.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/usr/src/lib/libuutil/common/uu_avl.c b/usr/src/lib/libuutil/common/uu_avl.c index 504b413a3a..93feea9c95 100644 --- a/usr/src/lib/libuutil/common/uu_avl.c +++ b/usr/src/lib/libuutil/common/uu_avl.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -155,7 +154,7 @@ uu_avl_node_init(void *base, uu_avl_node_t *np, uu_avl_pool_t *pp) } na[0] = POOL_TO_MARKER(pp); - na[1] = NULL; + na[1] = 0; } void @@ -169,7 +168,7 @@ uu_avl_node_fini(void *base, uu_avl_node_t *np, uu_avl_pool_t *pp) "node already finied\n", base, np, pp, pp->uap_name); } - if (na[0] != POOL_TO_MARKER(pp) || na[1] != NULL) { + if (na[0] != POOL_TO_MARKER(pp) || na[1] != 0) { uu_panic("uu_avl_node_fini(%p, %p, %p (\"%s\")): " "node corrupt, in tree, or in different pool\n", base, np, pp, pp->uap_name); @@ -449,7 +448,7 @@ uu_avl_remove(uu_avl_t *ap, void *elem) avl_remove(&ap->ua_tree, elem); na[0] = POOL_TO_MARKER(pp); - na[1] = NULL; + na[1] = 0; } void * @@ -462,7 +461,7 @@ uu_avl_teardown(uu_avl_t *ap, void **cookie) uintptr_t *na = NODE_ARRAY(pp, elem); na[0] = POOL_TO_MARKER(pp); - na[1] = NULL; + na[1] = 0; } return (elem); } @@ -495,11 +494,11 @@ uu_avl_insert(uu_avl_t *ap, void *elem, uu_avl_index_t idx) uu_avl_pool_t *pp = ap->ua_pool; uintptr_t *na = NODE_ARRAY(pp, elem); - if (na[1] != NULL) + if (na[1] != 0) uu_panic("uu_avl_insert(%p, %p, %p): node already " "in tree, or corrupt\n", ap, elem, idx); - if (na[0] == NULL) + if (na[0] == 0) uu_panic("uu_avl_insert(%p, %p, %p): node not " "initialized\n", ap, elem, idx); |