1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
From f4c5710192256e903b253353fb018ebd68d0b651 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 6 Nov 2016 22:35:16 -0800
Subject: [PATCH 7/8] Remove FILEWRAP
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
xbmc/utils/posix/PosixInterfaceForCLog.cpp | 6 +-----
xbmc/utils/posix/PosixInterfaceForCLog.h | 4 +---
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/xbmc/utils/posix/PosixInterfaceForCLog.cpp b/xbmc/utils/posix/PosixInterfaceForCLog.cpp
index 6614487..a91d157 100644
--- a/xbmc/utils/posix/PosixInterfaceForCLog.cpp
+++ b/xbmc/utils/posix/PosixInterfaceForCLog.cpp
@@ -28,10 +28,6 @@
#include "platform/android/activity/XBMCApp.h"
#endif // TARGET_ANDROID
-struct FILEWRAP : public FILE
-{};
-
-
CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
m_file(NULL)
{ }
@@ -51,7 +47,7 @@ bool CPosixInterfaceForCLog::OpenLogFile(const std::string &logFilename, const s
(void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
(void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
+ m_file = fopen(logFilename.c_str(), "wb");
if (!m_file)
return false; // error, can't open log file
diff --git a/xbmc/utils/posix/PosixInterfaceForCLog.h b/xbmc/utils/posix/PosixInterfaceForCLog.h
index bb53442..2983e73 100644
--- a/xbmc/utils/posix/PosixInterfaceForCLog.h
+++ b/xbmc/utils/posix/PosixInterfaceForCLog.h
@@ -21,8 +21,6 @@
#include <string>
-struct FILEWRAP; // forward declaration, wrapper for FILE
-
class CPosixInterfaceForCLog
{
public:
@@ -34,5 +32,5 @@ public:
void PrintDebugString(const std::string& debugString);
static void GetCurrentLocalTime(int& hour, int& minute, int& second);
private:
- FILEWRAP* m_file;
+ FILE * m_file;
};
--
2.10.2
|