Browse Source

MT#56759 use g_clear_pointer

in a few more places in recording.c

Change-Id: I2962ce085ca2ee7bcdc2b594a0706be33a862dee
pull/1642/head
Richard Fuchs 3 years ago
parent
commit
6046d5bdaa
1 changed files with 4 additions and 7 deletions
  1. +4
    -7
      daemon/recording.c

+ 4
- 7
daemon/recording.c View File

@ -159,10 +159,7 @@ static const struct rec_pcap_format *rec_pcap_format;
*/ */
void recording_fs_free(void) { void recording_fs_free(void) {
if (spooldir)
free(spooldir);
spooldir = NULL;
g_clear_pointer(&spooldir, free);
} }
/** /**
@ -617,7 +614,7 @@ static void rec_pcap_recording_finish_file(struct recording *recording) {
if (recording->u.pcap.recording_pdumper != NULL) { if (recording->u.pcap.recording_pdumper != NULL) {
pcap_dump_flush(recording->u.pcap.recording_pdumper); pcap_dump_flush(recording->u.pcap.recording_pdumper);
pcap_dump_close(recording->u.pcap.recording_pdumper); pcap_dump_close(recording->u.pcap.recording_pdumper);
free(recording->u.pcap.recording_path);
g_clear_pointer(&recording->u.pcap.recording_path, free);
} }
if (recording->u.pcap.recording_pd != NULL) { if (recording->u.pcap.recording_pd != NULL) {
pcap_close(recording->u.pcap.recording_pd); pcap_close(recording->u.pcap.recording_pd);
@ -709,8 +706,8 @@ void recording_finish(struct call *call) {
_rm(finish, call); _rm(finish, call);
free(recording->meta_prefix);
free(recording->escaped_callid);
g_clear_pointer(&recording->meta_prefix, free);
g_clear_pointer(&recording->escaped_callid, free);
g_slice_free1(sizeof(*(recording)), recording); g_slice_free1(sizeof(*(recording)), recording);
call->recording = NULL; call->recording = NULL;


Loading…
Cancel
Save