sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cbfstool/lzma: Remove C++ remnants

Browse Source 
The original lzma code was probably designed as a library, and had
tons of checks for __cplusplus and extern "C". They were not removed
when imported, but remove them now.

Change-Id: I4ae6e7739d191093c57130de8ae40da835e81bd1
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-on: http://review.coreboot.org/4835
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Alexandru Gagniuc
2014-01-27 14:25:19 -06:00
parent 91e9f27973
commit 5719bdc81c
4 changed files with 0 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
util/cbfstool/lzma/C/LzFind.h
View File

@@ -6,10 +6,6 @@
#include "Types.h" #include "Types.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef uint32_t CLzRef; typedef uint32_t CLzRef;
typedef struct _CMatchFinder typedef struct _CMatchFinder
@@ -108,8 +104,4 @@ uint32_t Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, uint32_t *distances);
void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, uint32_t num); void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, uint32_t num);
void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, uint32_t num); void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, uint32_t num);
#ifdef __cplusplus
}
#endif
#endif #endif

8
util/cbfstool/lzma/C/LzmaDec.h
View File

@@ -6,10 +6,6 @@
#include "Types.h" #include "Types.h"
#ifdef __cplusplus
extern "C" {
#endif
/* #define _LZMA_PROB32 */ /* #define _LZMA_PROB32 */
/* _LZMA_PROB32 can increase the speed on some CPUs, /* _LZMA_PROB32 can increase the speed on some CPUs,
but memory usage for CLzmaDec::probs will be doubled in that case */ but memory usage for CLzmaDec::probs will be doubled in that case */
@@ -224,8 +220,4 @@ SRes LzmaDecode(uint8_t *dest, size_t *destLen, const uint8_t *src, size_t *srcL
const uint8_t *propData, unsigned propSize, ELzmaFinishMode finishMode, const uint8_t *propData, unsigned propSize, ELzmaFinishMode finishMode,
ELzmaStatus *status, ISzAlloc *alloc); ELzmaStatus *status, ISzAlloc *alloc);
#ifdef __cplusplus
}
#endif
#endif #endif

8
util/cbfstool/lzma/C/LzmaEnc.h
View File

@@ -6,10 +6,6 @@
#include "Types.h" #include "Types.h"
#ifdef __cplusplus
extern "C" {
#endif
#define LZMA_PROPS_SIZE 5 #define LZMA_PROPS_SIZE 5
typedef struct _CLzmaEncProps typedef struct _CLzmaEncProps
@@ -73,8 +69,4 @@ SRes LzmaEncode(uint8_t *dest, size_t *destLen, const uint8_t *src, size_t srcLe
const CLzmaEncProps *props, uint8_t *propsEncoded, size_t *propsSize, int writeEndMark, const CLzmaEncProps *props, uint8_t *propsEncoded, size_t *propsSize, int writeEndMark,
ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig); ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
#ifdef __cplusplus
}
#endif
#endif #endif

20
util/cbfstool/lzma/C/Types.h
View File

@@ -12,18 +12,6 @@
#include <windows.h> #include <windows.h>
#endif #endif
#ifndef EXTERN_C_BEGIN
#ifdef __cplusplus
#define EXTERN_C_BEGIN extern "C" {
#define EXTERN_C_END }
#else
#define EXTERN_C_BEGIN
#define EXTERN_C_END
#endif
#endif
EXTERN_C_BEGIN
#define SZ_OK 0 #define SZ_OK 0
#define SZ_ERROR_DATA 1 #define SZ_ERROR_DATA 1
@@ -97,9 +85,6 @@ typedef struct ISeqInStream
SRes (*Read)(void *p, void *buf, size_t *size); SRes (*Read)(void *p, void *buf, size_t *size);
/* if (input(*size) != 0 && output(*size) == 0) means end_of_stream. /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
(output(*size) < input(*size)) is allowed */ (output(*size) < input(*size)) is allowed */
#ifdef __cplusplus
ISeqInStream(): Read() { } // -Weffc++
#endif
} ISeqInStream; } ISeqInStream;
/* it can return SZ_ERROR_INPUT_EOF */ /* it can return SZ_ERROR_INPUT_EOF */
@@ -112,9 +97,6 @@ typedef struct ISeqOutStream
size_t (*Write)(void *p, const void *buf, size_t size); size_t (*Write)(void *p, const void *buf, size_t size);
/* Returns: result - the number of actually written bytes. /* Returns: result - the number of actually written bytes.
(result < size) means error */ (result < size) means error */
#ifdef __cplusplus
ISeqOutStream(): Write() { } // -Weffc++
#endif
} ISeqOutStream; } ISeqOutStream;
typedef enum typedef enum
@@ -197,6 +179,4 @@ typedef struct
#define IAlloc_Alloc(p, size) (p)->Alloc((p), size) #define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
#define IAlloc_Free(p, a) (p)->Free((p), a) #define IAlloc_Free(p, a) (p)->Free((p), a)
EXTERN_C_END
#endif #endif