From owner-p4-projects@FreeBSD.ORG Mon May 3 08:37:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6015516A4E8; Mon, 3 May 2004 08:37:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3380D16A4CE for ; Mon, 3 May 2004 08:37:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3E9843D4C for ; Mon, 3 May 2004 08:37:57 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43FbvGe045482 for ; Mon, 3 May 2004 08:37:57 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43FbvKB045479 for perforce@freebsd.org; Mon, 3 May 2004 08:37:57 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Mon, 3 May 2004 08:37:57 -0700 (PDT) Message-Id: <200405031537.i43FbvKB045479@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 52142 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 May 2004 15:37:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=52142 Change 52142 by areisse@areisse_ibook on 2004/05/03 08:37:37 use some different malloc functions Affected files ... .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/sebsd/ss/global.h#2 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/sebsd/ss/queue.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/sebsd/ss/global.h#2 (text+ko) ==== @@ -31,7 +31,9 @@ #include #define sebsd_malloc(a,b,c) (c&M_ZERO)?calloc(1,a):malloc(a) #define sebsd_free(a,b) free(a) -#define kmalloc(l, f) malloc(l) +#define sebsd_ss_malloc(a,b) (b&M_ZERO)?calloc(1,a):malloc(a) +#define sebsd_ss_free(a) free(a) +#define kmalloc(l,f) sebsd_ss_malloc(l,f) #define mtx_lock(a) #define mtx_unlock(a) #endif /* _KERNEL */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/sebsd/ss/queue.c#2 (text+ko) ==== @@ -11,9 +11,6 @@ #include #include #include -#else /* FreeBSD _KERNEL */ -#define malloc(a,b,c) (c&M_ZERO)?calloc(1,a):malloc(a) -#define free(a,b) free(a) #endif #include @@ -25,8 +22,8 @@ { queue_t q; - q = (queue_t) malloc(sizeof(struct queue_info), - M_SEBSD, M_WAITOK); + q = (queue_t) sebsd_ss_malloc(sizeof(struct queue_info), + M_WAITOK); if (q == NULL) return NULL; @@ -43,8 +40,8 @@ if (!q) return -1; - newnode = (queue_node_ptr_t) malloc(sizeof(struct queue_node), - M_SEBSD, M_WAITOK); + newnode = (queue_node_ptr_t) sebsd_ss_malloc(sizeof(struct queue_node), + M_WAITOK); if (newnode == NULL) return -1; @@ -69,8 +66,8 @@ if (!q) return -1; - newnode = (queue_node_ptr_t) malloc(sizeof(struct queue_node), - M_SEBSD, M_WAITOK); + newnode = (queue_node_ptr_t) sebsd_ss_malloc(sizeof(struct queue_node), + M_WAITOK); if (newnode == NULL) return -1; @@ -106,7 +103,7 @@ q->tail = NULL; e = node->element; - free(node, M_SEBSD); + sebsd_ss_free(node); return e; } @@ -135,10 +132,10 @@ while (p != NULL) { temp = p; p = p->next; - free(temp, M_SEBSD); + sebsd_ss_free(temp); } - free(q, M_SEBSD); + sebsd_ss_free(q); } int queue_map(queue_t q, int (*f) (queue_element_t, void *), void *vp) @@ -191,7 +188,7 @@ temp = p; p = p->next; g(temp->element, vp); - free(temp, M_SEBSD); + sebsd_ss_free(temp); } else { last = p; p = p->next;