svn commit: r199265 - head/usr.bin/kdump

[Colin Percival]

Author: cperciva
Date: Sat Nov 14 09:33:51 2009
New Revision: 199265
URL: http://svn.freebsd.org/changeset/base/199265

Log:
  Update malloc utrace structure parsing to reflect the change (r199265)
  in how malloc_init is logged from (0, 0, 0) to (-1, 0, 0).
  
  While we're here, simplify the logic.
  
  Reviewed by:	jhb (earlier version)

Modified:
  head/usr.bin/kdump/kdump.c

Modified: head/usr.bin/kdump/kdump.c
==============================================================================
--- head/usr.bin/kdump/kdump.c	Sat Nov 14 09:31:47 2009	(r199264)
+++ head/usr.bin/kdump/kdump.c	Sat Nov 14 09:33:51 2009	(r199265)
@@ -1121,17 +1121,14 @@ ktruser_malloc(int len, unsigned char *p
 {
 	struct utrace_malloc *ut = (struct utrace_malloc *)p;
 
-	if (ut->p == NULL) {
-		if (ut->s == 0 && ut->r == NULL)
-			printf("malloc_init()\n");
-		else
-			printf("%p = malloc(%zu)\n", ut->r, ut->s);
-	} else {
-		if (ut->s == 0)
-			printf("free(%p)\n", ut->p);
-		else
-			printf("%p = realloc(%p, %zu)\n", ut->r, ut->p, ut->s);
-	}
+	if (ut->p == (void *)(intptr_t)(-1))
+		printf("malloc_init()\n");
+	else if (ut->s == 0)
+		printf("free(%p)\n", ut->p);
+	else if (ut->p == NULL)
+		printf("%p = malloc(%zu)\n", ut->r, ut->s);
+	else
+		printf("%p = realloc(%p, %zu)\n", ut->r, ut->p, ut->s);
 }
 
 void