mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ep/maint-equals-null-cocci'

Browse Source 
Introduce and apply coccinelle rule to discourage an explicit
comparison between a pointer and NULL, and applies the clean-up to
the maintenance track.

* ep/maint-equals-null-cocci:
  tree-wide: apply equals-null.cocci
  tree-wide: apply equals-null.cocci
  contrib/coccinnelle: add equals-null.cocci
This commit is contained in:
Junio C Hamano
2022-05-20 15:26:59 -07:00
parent acdeb10f91 72a4ea71e5
commit 538dc459a0
67 changed files with 180 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mailmap.c
View File

@ -77,7 +77,7 @@ static void add_mapping(struct string_list *map,
struct mailmap_entry *me;
struct string_list_item *item;
if (old_email == NULL) {
if (!old_email) {
old_email = new_email;
new_email = NULL;
}
@ -92,7 +92,7 @@ static void add_mapping(struct string_list *map,
item->util = me;
}
if (old_name == NULL) {
if (!old_name) {
debug_mm("mailmap: adding (simple) entry for '%s'\n", old_email);
/* Replace current name and new email for simple entry */
@ -123,9 +123,9 @@ static char *parse_name_and_email(char *buffer, char **name,
char *left, *right, *nstart, *nend;
*name = *email = NULL;
if ((left = strchr(buffer, '<')) == NULL)
if (!(left = strchr(buffer, '<')))
return NULL;
if ((right = strchr(left+1, '>')) == NULL)
if (!(right = strchr(left + 1, '>')))
return NULL;
if (!allow_empty_email && (left+1 == right))
return NULL;
@ -153,7 +153,7 @@ static void read_mailmap_line(struct string_list *map, char *buffer)
if (buffer[0] == '#')
return;
if ((name2 = parse_name_and_email(buffer, &name1, &email1, 0)) != NULL)
if ((name2 = parse_name_and_email(buffer, &name1, &email1, 0)))
parse_name_and_email(name2, &name2, &email2, 1);
if (email1)
@ -320,7 +320,7 @@ int map_user(struct string_list *map,
(int)*emaillen, debug_str(*email));
item = lookup_prefix(map, *email, *emaillen);
if (item != NULL) {
if (item) {
me = (struct mailmap_entry *)item->util;
if (me->namemap.nr) {
/*
@ -334,7 +334,7 @@ int map_user(struct string_list *map,
item = subitem;
}
}
if (item != NULL) {
if (item) {
struct mailmap_info *mi = (struct mailmap_info *)item->util;
if (mi->name == NULL && mi->email == NULL) {
debug_mm("map_user: -- (no simple mapping)\n");