proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-17 19:55:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug #158: Deletion of unnecessary checks before a few calls of LXC functions

Browse Source 
The following functions return immediately if a null pointer was passed.
* container_destroy
* lxc_cgroup_process_info_free_and_remove
* lxc_cgroup_put_meta
* toss_list

It is therefore not needed that a function caller repeats a corresponding check.

This issue was fixed by using the software Coccinelle 1.0.0-rc23.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
This commit is contained in:
Markus Elfring 2015-01-24 20:38:49 +01:00 committed by Stéphane Graber
parent f10fad2f53
commit c55d4505e3
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/cgfs.c
View File

@ -2248,10 +2248,8 @@ static void cgfs_destroy(void *hdata)
if (!d) if (!d)
return; return;
free(d->name); free(d->name);
if (d->info) lxc_cgroup_process_info_free_and_remove(d->info);
lxc_cgroup_process_info_free_and_remove(d->info); lxc_cgroup_put_meta(d->meta);
if (d->meta)
lxc_cgroup_put_meta(d->meta);
free(d); free(d);
} }

8
src/lxc/lxc_autostart.c
View File

@ -482,7 +482,7 @@ int main(int argc, char *argv[])
if ( lxc_container_put(c) > 0 ) { if ( lxc_container_put(c) > 0 ) {
containers[i] = NULL; containers[i] = NULL;
} }
if ( c_groups_lists && c_groups_lists[i] ) { if ( c_groups_lists ) {
toss_list(c_groups_lists[i]); toss_list(c_groups_lists[i]);
c_groups_lists[i] = NULL; c_groups_lists[i] = NULL;
} }
@ -501,11 +501,7 @@ int main(int argc, char *argv[])
} }
free(c_groups_lists); free(c_groups_lists);
toss_list( cmd_groups_list );
if ( cmd_groups_list ) {
toss_list( cmd_groups_list );
}
free(containers); free(containers);
return 0; return 0;

2
src/lxc/lxccontainer.c
View File

@ -1378,7 +1378,7 @@ out_unlock:
if (partial_fd >= 0) if (partial_fd >= 0)
remove_partial(c, partial_fd); remove_partial(c, partial_fd);
out: out:
if (!ret && c) if (!ret)
container_destroy(c); container_destroy(c);
free_tpath: free_tpath:
free(tpath); free(tpath);