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

Streamline free and null steps

Browse Source
This commit is contained in:
Mr-Dave
2022-05-02 20:59:29 -06:00
parent fbf294e32d
commit 2db9e435b2
14 changed files with 105 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/netcam.cpp
View File

@@ -1886,31 +1886,31 @@ static void netcam_shutdown(struct ctx_netcam *netcam)
if (netcam->path != NULL) {
free(netcam->path);
netcam->path = NULL;
}
netcam->path = NULL;
if (netcam->img_latest != NULL) {
free(netcam->img_latest->ptr);
free(netcam->img_latest);
netcam->img_latest = NULL;
}
netcam->img_latest = NULL;
if (netcam->img_recv != NULL) {
free(netcam->img_recv->ptr);
free(netcam->img_recv);
netcam->img_recv = NULL;
}
netcam->img_recv = NULL;
if (netcam->decoder_nm != NULL) {
free(netcam->decoder_nm);
netcam->decoder_nm = NULL;
}
netcam->decoder_nm = NULL;
util_parms_free(netcam->params);
if (netcam->params != NULL) {
free(netcam->params);
netcam->params = NULL;
}
netcam->params = NULL;
}
}
@@ -2304,8 +2304,11 @@ void netcam_cleanup(struct ctx_cam *cam, bool init_retry_flag)
pthread_mutex_destroy(&netcam->mutex_pktarray);
pthread_mutex_destroy(&netcam->mutex_transfer);
free(netcam);
netcam = NULL;
if (netcam != NULL) {
free(netcam);
netcam = NULL;
}
if (indx_cam == 1) {
MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO
,_("Norm: Shut down complete."));