mailmap: Some more style cleanup

mystor · mystor · commit ae2221362f68 · 2018-06-14T22:43:26.000-07:00
diff --git a/src/mailmap.c b/src/mailmap.c
@@ -246,7 +246,7 @@ void git_mailmap_resolve(
 	}
 }
 
-git_mailmap_entry* git_mailmap_entry_lookup(
+git_mailmap_entry *git_mailmap_entry_lookup(
 	git_mailmap *mailmap,
 	const char *name,
 	const char *email)
@@ -265,9 +265,12 @@ git_mailmap_entry* git_mailmap_entry_lookup(
 	return NULL;
 }
 
-git_mailmap_entry* git_mailmap_entry_byindex(git_mailmap *mailmap, size_t idx)
+git_mailmap_entry *git_mailmap_entry_byindex(git_mailmap *mailmap, size_t idx)
 {
-	return git_vector_get(&mailmap->entries, idx);
+	if (idx < git_vector_length(&mailmap->entries))
+		return git_vector_get(&mailmap->entries, idx);
+
+	return NULL;
 }
 
 size_t git_mailmap_entry_count(git_mailmap *mailmap)

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ void git_mailmap_resolve(`
`246`	`246`	`}`
`247`	`247`	`}`
`248`	`248`
`249`		`-git_mailmap_entry* git_mailmap_entry_lookup(`
	`249`	`+git_mailmap_entry *git_mailmap_entry_lookup(`
`250`	`250`	`git_mailmap *mailmap,`
`251`	`251`	`const char *name,`
`252`	`252`	`const char *email)`
`@@ -265,9 +265,12 @@ git_mailmap_entry* git_mailmap_entry_lookup(`
`265`	`265`	`return NULL;`
`266`	`266`	`}`
`267`	`267`
`268`		`-git_mailmap_entry* git_mailmap_entry_byindex(git_mailmap *mailmap, size_t idx)`
	`268`	`+git_mailmap_entry git_mailmap_entry_byindex(git_mailmap mailmap, size_t idx)`
`269`	`269`	`{`
`270`		`- return git_vector_get(&mailmap->entries, idx);`
	`270`	`+ if (idx < git_vector_length(&mailmap->entries))`
	`271`	`+ return git_vector_get(&mailmap->entries, idx);`
	`272`	`+`
	`273`	`+ return NULL;`
`271`	`274`	`}`
`272`	`275`
`273`	`276`	`size_t git_mailmap_entry_count(git_mailmap *mailmap)`