From 771ff739b6e601d261fe01b86492c17c64ca6c08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Mon, 27 Jan 2014 22:05:38 +0200
Subject: [PATCH] Simplify debugging code - always write debug trace files to
 the cur directory

This reduces the amount of platform ifdefs.
---
 codec/decoder/core/src/mem_align.cpp             |  4 ++--
 codec/encoder/core/src/slice_multi_threading.cpp |  6 +-----
 codec/encoder/core/src/utils.cpp                 | 10 +---------
 codec/encoder/plus/src/welsEncoderExt.cpp        | 11 +----------
 4 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/codec/decoder/core/src/mem_align.cpp b/codec/decoder/core/src/mem_align.cpp
index b0dc5eb4..55d9103c 100644
--- a/codec/decoder/core/src/mem_align.cpp
+++ b/codec/decoder/core/src/mem_align.cpp
@@ -53,8 +53,8 @@ void_t* WelsMalloc (const uint32_t kuiSize, const str_t* kpTag) {
 
 #ifdef MEMORY_CHECK
   if (pMemCheckMalloc == NULL) {
-    pMemCheckMalloc = WelsFopen (".\\mem_check_malloc.txt", "at+");
-    pMemCheckFree   = WelsFopen (".\\mem_check_free.txt", "at+");
+    pMemCheckMalloc = WelsFopen ("mem_check_malloc.txt", "at+");
+    pMemCheckFree   = WelsFopen ("mem_check_free.txt", "at+");
   }
 
   if (kpTag != NULL) {
diff --git a/codec/encoder/core/src/slice_multi_threading.cpp b/codec/encoder/core/src/slice_multi_threading.cpp
index 84d6e95e..9e5750ab 100644
--- a/codec/encoder/core/src/slice_multi_threading.cpp
+++ b/codec/encoder/core/src/slice_multi_threading.cpp
@@ -428,11 +428,7 @@ int32_t RequestMtResource (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPara
     fclose (pSmt->pFSliceDiff);
     pSmt->pFSliceDiff = NULL;
   }
-#ifdef _WIN32
-  pSmt->pFSliceDiff	= fopen (".\\slice_time.txt", "wt+");
-#else
-  pSmt->pFSliceDiff	= fopen ("/tmp/slice_time.txt", "wt+");
-#endif//_WIN32
+  pSmt->pFSliceDiff	= fopen ("slice_time.txt", "wt+");
 #endif//MT_DEBUG
 
 #if defined(ENABLE_TRACE_MT)
diff --git a/codec/encoder/core/src/utils.cpp b/codec/encoder/core/src/utils.cpp
index 2cf21ab1..34af3d7b 100644
--- a/codec/encoder/core/src/utils.cpp
+++ b/codec/encoder/core/src/utils.cpp
@@ -264,7 +264,6 @@ void WelsReopenTraceFile (void* pCtx, str_t* pCurPath) {
 #ifdef ENABLE_TRACE_FILE
   sWelsEncCtx* pEncCtx	= (sWelsEncCtx*)pCtx;
   if (wlog == WelsLogDefault) {
-    str_t strTraceFile[MAX_FNAME_LEN] = {0};
     int32_t len = 0;
     if (pEncCtx->pFileLog != NULL) {
       fclose (pEncCtx->pFileLog);
@@ -274,14 +273,7 @@ void WelsReopenTraceFile (void* pCtx, str_t* pCurPath) {
     len = STRNLEN (pCurPath, MAX_FNAME_LEN - 1);	// confirmed_safe_unsafe_usage
     if (len >= MAX_FNAME_LEN)
       return;
-    STRNCPY (strTraceFile, MAX_FNAME_LEN, pCurPath, len);	// confirmed_safe_unsafe_usage
-#ifdef __GNUC__
-    STRCAT (strTraceFile, MAX_FNAME_LEN - len, "/wels_encoder_trace.txt");	// confirmed_safe_unsafe_usage
-#elif _WIN32
-    STRCAT (strTraceFile, MAX_FNAME_LEN - len, "\\wels_encoder_trace.txt"); // confirmed_safe_unsafe_usage
-#else
-#endif//__GNUC__
-    pEncCtx->pFileLog	= WelsFopen (strTraceFile, "wt+");	// confirmed_safe_unsafe_usage
+    pEncCtx->pFileLog	= WelsFopen ("wels_encoder_trace.txt", "wt+");	// confirmed_safe_unsafe_usage
   }
 #endif//ENABLE_TRACE_FILE
 }
diff --git a/codec/encoder/plus/src/welsEncoderExt.cpp b/codec/encoder/plus/src/welsEncoderExt.cpp
index be76534a..4c8ce151 100644
--- a/codec/encoder/plus/src/welsEncoderExt.cpp
+++ b/codec/encoder/plus/src/welsEncoderExt.cpp
@@ -408,16 +408,7 @@ int CWelsH264SVCEncoder::Initialize2 (void* argv, const INIT_TYPE iInitType) {
   }
 
 #if defined(OUTPUT_BIT_STREAM) || defined(ENABLE_TRACE_FILE)
-  str_t fpath[MAX_FNAME_LEN] = {0};
-#if defined(__GNUC__)
-  WelsSnprintf (fpath, MAX_FNAME_LEN, "/tmp/");		// confirmed_safe_unsafe_usage
-
-#else//__GNUC__
-
-  WelsSnprintf (fpath, MAX_FNAME_LEN, ".\\");		// confirmed_safe_unsafe_usage
-#endif //__GNUC__
-
-  strcpy (pCfg->sTracePath, fpath);		// confirmed_safe_unsafe_usage
+  pCfg->sTracePath[0] = '\0';
 
 #endif //#if defined(OUTPUT_BIT_STREAM) || defined(ENABLE_TRACE_FILE)