Index: lib/libc/stdlib/bsearch.3
===================================================================
--- lib/libc/stdlib/bsearch.3
+++ lib/libc/stdlib/bsearch.3
@@ -93,26 +93,26 @@
 #include <string.h>
 
 struct person {
-	char name[5];
-	int age;
+	const char 	*name;
+	int 		age;
 };
 
 int
-compare(const void *key, const void *array_member)
+compare(const void *a, const void *b)
 {
-	int age = (intptr_t) key;
-	struct person person = *(struct person *) array_member;
+	const struct person *person_a = (const struct person *) a;
+	const struct person *person_b = (const struct person *) b;
 
-	return (age - person.age);
+	return (person_a->age - person_b->age);
 }
 
 int
-main()
+main(void)
 {
 	struct person *friend;
 
 	/* Sorted array */
-	struct person friends[6] = {
+	const struct person friends[] = {
 		{ "paul", 22 },
 		{ "anne", 25 },
 		{ "fred", 25 },
@@ -121,17 +121,24 @@
 		{ "bill", 50 }
 	};
 
-	size_t array_size = sizeof(friends) / sizeof(struct person);
+	const size_t len = sizeof(friends) / sizeof(friends[0]);
 
-	friend = bsearch((void *)22, &friends, array_size, sizeof(struct person), compare);
+	struct person target = { "Someone", 22 };
+	friend = bsearch(&target, friends, len, sizeof(friends[0]), compare);
 	assert(strcmp(friend->name, "paul") == 0);
 	printf("name: %s\enage: %d\en", friend->name, friend->age);
 
-	friend = bsearch((void *)25, &friends, array_size, sizeof(struct person), compare);
+	target.age = 25;
+	friend = bsearch(&target, friends, len, sizeof(friends[0]), compare);
+	/*
+	 * For multiple elements with the same key, it is implementation
+	 * defined which will be returned.
+	 */
 	assert(strcmp(friend->name, "fred") == 0 || strcmp(friend->name, "anne") == 0);
 	printf("name: %s\enage: %d\en", friend->name, friend->age);
 
-	friend = bsearch((void *)30, &friends, array_size, sizeof(struct person), compare);
+	target.age = 30;
+	friend = bsearch(&target, friends, len, sizeof(friends[0]), compare);
 	assert(friend == NULL);
 	printf("friend aged 30 not found\en");