This commit is contained in:
aixiao 2022-10-08 14:38:34 +08:00
commit 764491d70a

10
conf.c
View File

@ -212,6 +212,7 @@ void read_conf(char *filename, conf * configure)
void free_conf(conf * conf) void free_conf(conf * conf)
{ {
<<<<<<< HEAD
if (conf->DAEMON) if (conf->DAEMON)
free(conf->DAEMON); free(conf->DAEMON);
if (conf->PHONE) if (conf->PHONE)
@ -227,6 +228,15 @@ void free_conf(conf * conf)
if (conf->PUBLIC_IP) if (conf->PUBLIC_IP)
free(conf->PUBLIC_IP); free(conf->PUBLIC_IP);
=======
free(conf->DAEMON);
free(conf->PHONE);
free(conf->DING_WEBHOOK);
free(conf->SEND_QQ);
free(conf->QQMAIL_KEY);
free(conf->RECV_MAIL);
>>>>>>> 969927106ef9eb03564fd5e1501260cc1b957d4a
return; return;
} }