Merge branch 'ab/free-and-null'
A common pattern to free a piece of memory and assign NULL to the pointer that used to point at it has been replaced with a new FREE_AND_NULL() macro. * ab/free-and-null: *.[ch] refactoring: make use of the FREE_AND_NULL() macro coccinelle: make use of the "expression" FREE_AND_NULL() rule coccinelle: add a rule to make "expression" code use FREE_AND_NULL() coccinelle: make use of the "type" FREE_AND_NULL() rule coccinelle: add a rule to make "type" code use FREE_AND_NULL() git-compat-util: add a FREE_AND_NULL() wrapper around free(ptr); ptr = NULL
This commit is contained in:
@ -94,8 +94,7 @@ static void credential_apply_config(struct credential *c)
|
||||
c->configured = 1;
|
||||
|
||||
if (!c->use_http_path && proto_is_http(c->protocol)) {
|
||||
free(c->path);
|
||||
c->path = NULL;
|
||||
FREE_AND_NULL(c->path);
|
||||
}
|
||||
}
|
||||
|
||||
@ -315,10 +314,8 @@ void credential_reject(struct credential *c)
|
||||
for (i = 0; i < c->helpers.nr; i++)
|
||||
credential_do(c, c->helpers.items[i].string, "erase");
|
||||
|
||||
free(c->username);
|
||||
c->username = NULL;
|
||||
free(c->password);
|
||||
c->password = NULL;
|
||||
FREE_AND_NULL(c->username);
|
||||
FREE_AND_NULL(c->password);
|
||||
c->approved = 0;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user