mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-05-18 19:45:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revise free then null steps to be a single function

Browse Source
This commit is contained in:
Mr-Dave
2022-05-03 21:26:04 -06:00
parent 7c050153e8
commit 7ac8410049
16 changed files with 122 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/motionplus.cpp
View File

@@ -694,10 +694,7 @@ static void motion_cam_delete(struct ctx_motapp *motapp)
return;
}
if (motapp->cam_list[motapp->cam_delete]->dbse != NULL) {
free(motapp->cam_list[motapp->cam_delete]->dbse);
motapp->cam_list[motapp->cam_delete]->dbse = NULL;
}
myfree(&motapp->cam_list[motapp->cam_delete]->dbse);
dbse_motpls_deinit(motapp->cam_list[motapp->cam_delete]);
@@ -722,10 +719,7 @@ static void motion_cam_delete(struct ctx_motapp *motapp)
/* Swap out the old list with the new */
pthread_mutex_lock(&motapp->mutex_camlst);
if (motapp->cam_list != NULL) {
free(motapp->cam_list);
motapp->cam_list = NULL;
}
myfree(&motapp->cam_list);
motapp->cam_list = tmp;
pthread_mutex_unlock(&motapp->mutex_camlst);