PERFORCE change 104028 for review

Roman Divacky rdivacky at FreeBSD.org
Tue Aug 15 13:59:11 UTC 2006


http://perforce.freebsd.org/chv.cgi?CH=104028

Change 104028 by rdivacky at rdivacky_witten on 2006/08/15 13:58:45

	MALLOC -> malloc and FREE -> free
	
	Pointed out by: jhb

Affected files ...

.. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#9 edit

Differences ...

==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#9 (text+ko) ====

@@ -82,14 +82,14 @@
 
 	if (child != 0) {
 	   	/* non-exec call */
-   		MALLOC(em, struct linux_emuldata *, sizeof *em, M_LINUX, M_WAITOK | M_ZERO);
+   		em = (struct linux_emuldata *) malloc(sizeof *em, M_LINUX, M_WAITOK | M_ZERO);
 		em->pid = child;
 		if (flags & CLONE_VM) {
 		   	/* handled later in the code */
 		} else {
 		   	struct linux_emuldata_shared *s;
 
-   			MALLOC(s, struct linux_emuldata_shared *, sizeof *s, M_LINUX, M_WAITOK | M_ZERO);
+   			s = (struct linux_emuldata_shared *) malloc(sizeof *s, M_LINUX, M_WAITOK | M_ZERO);
 			em->shared = s;
 			s->refs = 1;
 			s->group_pid = child;
@@ -174,7 +174,7 @@
 
 	em->shared->refs--;
 	if (em->shared->refs == 0)
-		FREE(em->shared, M_LINUX);
+		free(em->shared, M_LINUX);
 	EMUL_SHARED_WUNLOCK(&emul_shared_lock);
 
 	if (child_clear_tid != NULL) {
@@ -202,7 +202,7 @@
 	}
 
 	/* clean the stuff up */
-	FREE(em, M_LINUX);
+	free(em, M_LINUX);
 }
 
 /* 
@@ -234,10 +234,10 @@
 
 		em->shared->refs--;
 		if (em->shared->refs == 0)
-		   	FREE(em->shared, M_LINUX);
+		   	free(em->shared, M_LINUX);
 		EMUL_SHARED_WUNLOCK(&emul_shared_lock);
 
-		FREE(em, M_LINUX);
+		free(em, M_LINUX);
 	}
 }
 


More information about the p4-projects mailing list