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

Revise conf to pointer

Browse Source
This commit is contained in:
MrDave
2019-10-20 20:20:32 -06:00
committed by Mr-Dave
parent 6da65a43ca
commit f67cd78909
27 changed files with 1237 additions and 1203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/util.cpp
View File

@@ -20,6 +20,7 @@
*/
#include "motion.hpp"
#include "conf.hpp"
#include "util.hpp"
#include "logger.hpp"
#include "dbse.hpp" /*For dbse ID in format output */
@@ -446,8 +447,8 @@ size_t mystrftime(const struct ctx_cam *cam, char *s, size_t max, const char *us
break;
case '$': // thread name
if (cam->conf.camera_name && cam->conf.camera_name[0])
snprintf(tempstr, PATH_MAX, "%s", cam->conf.camera_name);
if (cam->conf->camera_name && cam->conf->camera_name[0])
snprintf(tempstr, PATH_MAX, "%s", cam->conf->camera_name);
else
++pos_userformat;
break;