From 7a67a5e47597dd390c74542d2be80247ecb58b84 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 13 Jun 2017 21:15:58 -0400
Subject: [PATCH] fix merge

---
 src/zm_event.cpp         | 16 ----------------
 src/zm_monitorstream.cpp |  4 ++--
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 87f1c263c..f75cd73da 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -158,11 +158,7 @@ Event::Event( Monitor *p_monitor, struct timeval p_start_time, const std::string
     if ( symlink( time_path, id_file ) < 0 )
       Fatal( "Can't symlink %s -> %s: %s", id_file, path, strerror(errno));
   } else {
-<<<<<<< HEAD
     snprintf( path, sizeof(path), "%s/%d/%d", storage->Path(), monitor->Id(), id );
-=======
-    snprintf( path, sizeof(path), "%s/%d/%d", staticConfig.DIR_EVENTS.c_str(), monitor->Id(), id );
->>>>>>> master
 
     errno = 0;
     stat( path, &statbuf );
@@ -705,7 +701,6 @@ bool EventStream::loadEventData( int event_id ) {
 
   if ( config.use_deep_storage ) {
     struct tm *event_time = localtime( &event_data->start_time );
-<<<<<<< HEAD
     if ( storage_path[0] == '/' )
       snprintf( event_data->path, sizeof(event_data->path), "%s/%ld/%02d/%02d/%02d/%02d/%02d/%02d", storage_path, event_data->monitor_id, event_time->tm_year-100, event_time->tm_mon+1, event_time->tm_mday, event_time->tm_hour, event_time->tm_min, event_time->tm_sec );
     else
@@ -715,17 +710,6 @@ bool EventStream::loadEventData( int event_id ) {
       snprintf( event_data->path, sizeof(event_data->path), "%s/%ld/%ld", storage_path, event_data->monitor_id, event_data->event_id );
     else
       snprintf( event_data->path, sizeof(event_data->path), "%s/%s/%ld/%ld", staticConfig.PATH_WEB.c_str(), storage_path, event_data->monitor_id, event_data->event_id );
-=======
-    if ( staticConfig.DIR_EVENTS.c_str()[0] == '/' )
-      snprintf( event_data->path, sizeof(event_data->path), "%s/%ld/%02d/%02d/%02d/%02d/%02d/%02d", staticConfig.DIR_EVENTS.c_str(), event_data->monitor_id, event_time->tm_year-100, event_time->tm_mon+1, event_time->tm_mday, event_time->tm_hour, event_time->tm_min, event_time->tm_sec );
-    else
-      snprintf( event_data->path, sizeof(event_data->path), "%s/%s/%ld/%02d/%02d/%02d/%02d/%02d/%02d", staticConfig.PATH_WEB.c_str(), staticConfig.DIR_EVENTS.c_str(), event_data->monitor_id, event_time->tm_year-100, event_time->tm_mon+1, event_time->tm_mday, event_time->tm_hour, event_time->tm_min, event_time->tm_sec );
-  } else {
-    if ( staticConfig.DIR_EVENTS.c_str()[0] == '/' )
-      snprintf( event_data->path, sizeof(event_data->path), "%s/%ld/%ld", staticConfig.DIR_EVENTS.c_str(), event_data->monitor_id, event_data->event_id );
-    else
-      snprintf( event_data->path, sizeof(event_data->path), "%s/%s/%ld/%ld", staticConfig.PATH_WEB.c_str(), staticConfig.DIR_EVENTS.c_str(), event_data->monitor_id, event_data->event_id );
->>>>>>> master
   }
   event_data->frame_count = dbrow[2] == NULL ? 0 : atoi(dbrow[3]);
   event_data->duration = atof(dbrow[4]);
diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index 07da05811..699ad6644 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -509,7 +509,7 @@ void MonitorStream::runStream() {
   // 15 is the max length for the swap path suffix, /zmswap-whatever, assuming max 6 digits for monitor id
   const int max_swap_len_suffix = 15; 
 
-  int swap_path_length = strlen(config.path_swap) + 1; // +1 for NULL terminator
+  int swap_path_length = staticConfig.PATH_SWAP.length() + 1; // +1 for NULL terminator
   int subfolder1_length = snprintf(NULL, 0, "/zmswap-m%d", monitor->Id() ) + 1;
   int subfolder2_length = snprintf(NULL, 0, "/zmswap-q%06d", connkey ) + 1;
   int total_swap_path_length = swap_path_length + subfolder1_length + subfolder2_length;
@@ -520,7 +520,7 @@ void MonitorStream::runStream() {
       Error( "Swap Path is too long. %d > %d ", total_swap_path_length+max_swap_len_suffix, PATH_MAX );
     } else {
       swap_path = (char *)malloc( total_swap_path_length+max_swap_len_suffix );
-      strncpy( swap_path, config.path_swap, swap_path_length );
+      strncpy( swap_path, staticConfig.PATH_SWAP.c_str(), swap_path_length );
 
       Debug( 3, "Checking swap path folder: %s", swap_path );
       if ( checkSwapPath( swap_path, false ) ) {