History

Use char instead of str_t

Martin Storsjö committed 12 years ago

Commit f2bd22a1 parent 7b96c6734 files · +131 −135Browse files

Showing the changes to codec/decoder/plus/src/welsCodecTrace.cpp (1 of 34 files). Show all

Unified · Split

codec/decoder/plus/src/welsCodecTrace.cpp+10−10
@@ -57,14 +57,14 @@ int32_t CWelsTraceBase::SetTraceLevel (int iLevel) { · 56 unmodified lines
5757 return 0;
5858 }
5959
60−int32_t CWelsTraceBase::Trace (const int kLevel, const str_t* kpFormat, va_list pVl) {
60+int32_t CWelsTraceBase::Trace (const int kLevel, const char* kpFormat, va_list pVl) {
6161 if (kLevel & m_iLevel) {
62− str_t chBuf[MAX_LOG_SIZE] = {0};
62+ char chBuf[MAX_LOG_SIZE] = {0};
6363 const int32_t kLen = strlen ("[DECODER]: ");
6464
65− WelsStrncpy (chBuf, MAX_LOG_SIZE, (const str_t*)"[DECODER]: ");
65+ WelsStrncpy (chBuf, MAX_LOG_SIZE, (const char*)"[DECODER]: ");
6666
67− WelsVsnprintf ((chBuf + kLen), MAX_LOG_SIZE - kLen, (const str_t*)kpFormat, pVl);
67+ WelsVsnprintf ((chBuf + kLen), MAX_LOG_SIZE - kLen, (const char*)kpFormat, pVl);
6868
6969 WriteString (kLevel, chBuf);
7070 }
@@ -72,8 +72,8 @@ int32_t CWelsTraceBase::Trace (const int kLevel, const str_t* kpFormat, va_list · 1 unmodified line
7272 return 0;
7373 }
7474
75−CWelsTraceFile::CWelsTraceFile (const str_t* pFileName) {
76− m_pTraceFile = WelsFopen (pFileName, (const str_t*)"wt");
75+CWelsTraceFile::CWelsTraceFile (const char* pFileName) {
76+ m_pTraceFile = WelsFopen (pFileName, (const char*)"wt");
7777 }
7878
7979 CWelsTraceFile::~CWelsTraceFile() {
@@ -83,9 +83,9 @@ CWelsTraceFile::~CWelsTraceFile() { · 3 unmodified lines
8383 }
8484 }
8585
86−int32_t CWelsTraceFile::WriteString (int32_t iLevel, const str_t* pStr) {
86+int32_t CWelsTraceFile::WriteString (int32_t iLevel, const char* pStr) {
8787 int iRC = 0;
88− const static str_t chEnter[16] = "\n";
88+ const static char chEnter[16] = "\n";
8989 if (m_pTraceFile) {
9090 iRC += WelsFwrite (pStr, 1, strlen (pStr), m_pTraceFile);
9191 iRC += WelsFwrite (chEnter, 1, strlen (chEnter), m_pTraceFile);
@@ -97,7 +97,7 @@ int32_t CWelsTraceFile::WriteString (int32_t iLevel, const str_t* pStr) { · 5 unmodified lines
9797
9898 #ifdef _WIN32
9999
100−int32_t CWelsTraceWinDgb::WriteString (int32_t iLevel, const str_t* pStr) {
100+int32_t CWelsTraceWinDgb::WriteString (int32_t iLevel, const char* pStr) {
101101 OutputDebugStringA (pStr);
102102
103103 return strlen (pStr);
@@ -134,7 +134,7 @@ int32_t CWelsCodecTrace::UnloadWelsTraceModule() { · 30 unmodified lines
134134 return 0;
135135 }
136136
137−int32_t CWelsCodecTrace::WriteString (int32_t iLevel, const str_t* pStr) {
137+int32_t CWelsCodecTrace::WriteString (int32_t iLevel, const char* pStr) {
138138 {
139139 switch (iLevel) {
140140 case WELS_LOG_ERROR:

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t