ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure all logging macro calls are terminated with a semicolon

This commit is contained in:
Peter Keresztes Schmidt 2021-05-02 23:08:48 +02:00
parent 260fcaadde
commit e5613d0d27
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_ffmpeg.h
View File

@ -393,7 +393,7 @@ void zm_dump_codecpar(const AVCodecParameters *par);
pkt.flags, \ pkt.flags, \
pkt.flags & AV_PKT_FLAG_KEY, \ pkt.flags & AV_PKT_FLAG_KEY, \
pkt.pos, \ pkt.pos, \
pkt.duration) \ pkt.duration); \
} }
#else #else

6
src/zm_local_camera.cpp
View File

@ -1836,9 +1836,9 @@ int LocalCamera::Hue(int p_hue) {
if ( vidioctl(vid_fd, VIDIOC_G_CTRL, &vid_control) < 0 ) { if ( vidioctl(vid_fd, VIDIOC_G_CTRL, &vid_control) < 0 ) {
if ( errno != EINVAL ) if ( errno != EINVAL )
Error("Unable to query hue: %s", strerror(errno)) Error("Unable to query hue: %s", strerror(errno));
else else
Warning("Hue control is not supported") Warning("Hue control is not supported");
} else if ( p_hue >= 0 ) { } else if ( p_hue >= 0 ) {
vid_control.value = p_hue; vid_control.value = p_hue;
@ -2151,7 +2151,7 @@ int LocalCamera::Capture(ZMPacket &zm_packet) {
return -1; return -1;
} }
} else { } else {
Error("Unable to requeue buffer due to not v4l2_data") Error("Unable to requeue buffer due to not v4l2_data");
} }
} }
#if ZM_HAS_V4L1 #if ZM_HAS_V4L1

20
src/zm_logger.h
View File

@ -194,15 +194,19 @@ inline Logger::Level logDebugging() {
return Logger::fetch()->debugOn(); return Logger::fetch()->debugOn();
} }
#define logPrintf(logLevel,params...) {\ #define logPrintf(logLevel, params...) \
if ( logLevel <= Logger::fetch()->level() )\ do { \
Logger::fetch()->logPrint( false, __FILE__, __LINE__, logLevel, ##params );\ if (logLevel <= Logger::fetch()->level()) { \
} Logger::fetch()->logPrint(false, __FILE__, __LINE__, logLevel, ##params); \
} \
} while (0)
#define logHexdump(logLevel,data,len) {\ #define logHexdump(logLevel, data, len) \
if ( logLevel <= Logger::fetch()->level() )\ do { \
Logger::fetch()->logPrint( true, __FILE__, __LINE__, logLevel, "%p (%d)", data, len );\ if (logLevel <= Logger::fetch()->level()) { \
} Logger::fetch()->logPrint(true, __FILE__, __LINE__, logLevel, "%p (%d)", data, len); \
} \
} while (0)
/* Debug compiled out */ /* Debug compiled out */
#ifndef DBG_OFF #ifndef DBG_OFF

4
src/zm_sdp.cpp
View File

@ -274,7 +274,9 @@ SessionDescriptor::SessionDescriptor( const std::string &url, const std::string
Debug(4, "sprop-parameter-sets value %s", c); Debug(4, "sprop-parameter-sets value %s", c);
currMedia->setSprops(std::string(c)); currMedia->setSprops(std::string(c));
} else { } else {
Debug( 3, "Ignoring SDP fmtp attribute '%s' for media '%s'", attr3Tokens[0].c_str(), currMedia->getType().c_str() ) Debug(3, "Ignoring SDP fmtp attribute '%s' for media '%s'",
attr3Tokens[0].c_str(),
currMedia->getType().c_str());
} }
} }
} }