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

fix merge

This commit is contained in:
Isaac Connor 2016-04-06 08:38:10 -04:00
parent 9d9369db6f
commit 4bc200f839
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_monitor.cpp
View File

@ -326,11 +326,7 @@ Monitor::Monitor(
images( 0 ), images( 0 ),
privacy_bitmask( NULL ) privacy_bitmask( NULL )
{ {
<<<<<<< HEAD
strncpy( name, p_name, sizeof(name) );
=======
strncpy( name, p_name, sizeof(name)-1 ); strncpy( name, p_name, sizeof(name)-1 );
>>>>>>> iconnor_video
strncpy( event_prefix, p_event_prefix, sizeof(event_prefix)-1 ); strncpy( event_prefix, p_event_prefix, sizeof(event_prefix)-1 );
strncpy( label_format, p_label_format, sizeof(label_format)-1 ); strncpy( label_format, p_label_format, sizeof(label_format)-1 );