From: Karel Zak <kzak@redhat.com>
Date: Fri, 24 Apr 2015 13:01:23 +0000 (+0200)
Subject: test_uuidd: make objdump more robust
X-Git-Tag: v2.27-rc1~233
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=032776e8b068b7a02b22736f900eb5962b7f8770;p=thirdparty%2Futil-linux.git

test_uuidd: make objdump more robust

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tests/helpers/test_uuidd.c b/tests/helpers/test_uuidd.c
index 52b0503248..7a4f8eb975 100644
--- a/tests/helpers/test_uuidd.c
+++ b/tests/helpers/test_uuidd.c
@@ -228,10 +228,11 @@ static void object_dump(size_t idx, object_t *obj)
 	p = uuid_string;
 	object_uuid_to_string(obj, &p);
 
-	fprintf(stderr, "object[%zu]: {uuid=<%s>,pid=%d,tid=%d}\n",
-	     idx, p,
-	     obj->thread->proc->pid,
-	     (int) obj->thread->tid);
+	fprintf(stderr, "object[%zu]: {\n", idx);
+	fprintf(stderr, "  uuid:    <%s>\n", p);
+	fprintf(stderr, "  process: %d\n", obj->thread && obj->thread->proc ? (int) obj->thread->proc->pid : 0);
+	fprintf(stderr, "  thread:  %d\n", obj->thread ? (int) obj->thread->tid : 0);
+	fprintf(stderr, "}\n");
 }
 
 int main(int argc, char *argv[])