mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-18 11:35:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Convert more char array buffers to std::string

Browse Source 
Remove now unused ZM_SQL_*SIZE defines
This commit is contained in:
Peter Keresztes Schmidt
2021-06-30 20:49:37 +02:00
parent fc15afefcf
commit c60b577aec
7 changed files with 71 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/zmc.cpp
View File

@@ -232,7 +232,6 @@ int main(int argc, char *argv[]) {
while (!zm_terminate) {
result = 0;
static char sql[ZM_SQL_SML_BUFSIZ];
for (const std::shared_ptr<Monitor> &monitor : monitors) {
monitor->LoadCamera();
@@ -244,11 +243,11 @@ int main(int argc, char *argv[]) {
monitor->SetStartupTime(now);
monitor->SetHeartbeatTime(now);
snprintf(sql, sizeof(sql),
std::string sql = stringtf(
"INSERT INTO Monitor_Status (MonitorId,Status,CaptureFPS,AnalysisFPS)"
" VALUES (%u, 'Running',0,0) ON DUPLICATE KEY UPDATE Status='Running',CaptureFPS=0,AnalysisFPS=0",
monitor->Id());
zmDbDo(sql);
zmDbDo(sql.c_str());
Seconds sleep_time = Seconds(0);
while (monitor->PrimeCapture() <= 0) {
@@ -273,10 +272,10 @@ int main(int argc, char *argv[]) {
break;
}
snprintf(sql, sizeof(sql),
sql = stringtf(
"INSERT INTO Monitor_Status (MonitorId,Status) VALUES (%u, 'Connected') ON DUPLICATE KEY UPDATE Status='Connected'",
monitor->Id());
zmDbDo(sql);
monitor->Id());
zmDbDo(sql.c_str());
} // end foreach monitor
if (zm_terminate){
@@ -360,11 +359,10 @@ int main(int argc, char *argv[]) {
} // end while ! zm_terminate outer connection loop
for (std::shared_ptr<Monitor> &monitor : monitors) {
static char sql[ZM_SQL_SML_BUFSIZ];
snprintf(sql, sizeof(sql),
std::string sql = stringtf(
"INSERT INTO Monitor_Status (MonitorId,Status) VALUES (%u, 'NotRunning') ON DUPLICATE KEY UPDATE Status='NotRunning'",
monitor->Id());
zmDbDo(sql);
zmDbDo(sql.c_str());
}
Image::Deinitialise();