replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[libclang] Change clang_VirtualFileOverlay_writeToBuffer to return a malloc'ed buffer. 

Returning CXString is not appropriate if we want to switch to a non-string format buffer.

llvm-svn: 202675
This commit is contained in:
Argyrios Kyrtzidis 2014-03-03 06:38:52 +00:00
parent 19dcc312ee
commit 74c96c0c75
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/include/clang-c/BuildSystem.h
View File

@ -62,13 +62,15 @@ clang_VirtualFileOverlay_addFileMapping(CXVirtualFileOverlay,
* \brief Write out the \c CXVirtualFileOverlay object to a char buffer.
*
* \param options is reserved, always pass 0.
* \param out_buffer pointer to receive the CXString object, which should be
* disposed using \c clang_disposeString().
* \param out_buffer_ptr pointer to receive the buffer pointer, which should be
* disposed using \c free().
* \param out_buffer_size pointer to receive the buffer size.
* \returns 0 for success, non-zero to indicate an error.
*/
CINDEX_LINKAGE enum CXErrorCode
clang_VirtualFileOverlay_writeToBuffer(CXVirtualFileOverlay, unsigned options,
CXString *out_buffer);
char **out_buffer_ptr,
unsigned *out_buffer_size);
/**
* \brief Dispose a \c CXVirtualFileOverlay object.

12
clang/tools/libclang/BuildSystem.cpp
View File

@ -162,9 +162,10 @@ private:
}
enum CXErrorCode
clang_VirtualFileOverlay_writeToBuffer(CXVirtualFileOverlay VFO,
unsigned, CXString *out_buffer) {
if (!VFO || !out_buffer)
clang_VirtualFileOverlay_writeToBuffer(CXVirtualFileOverlay VFO, unsigned,
char **out_buffer_ptr,
unsigned *out_buffer_size) {
if (!VFO || !out_buffer_ptr || !out_buffer_size)
return CXError_InvalidArguments;
llvm::SmallVector<EntryTy, 16> Entries;
@ -186,7 +187,10 @@ clang_VirtualFileOverlay_writeToBuffer(CXVirtualFileOverlay VFO,
JSONVFSPrinter Printer(OS);
Printer.print(Entries);
*out_buffer = cxstring::createDup(OS.str());
StringRef Data = OS.str();
*out_buffer_ptr = (char*)malloc(Data.size());
*out_buffer_size = Data.size();
memcpy(*out_buffer_ptr, Data.data(), Data.size());
return CXError_Success;
}

10
clang/unittests/libclang/LibclangTest.cpp
View File

@ -51,10 +51,12 @@ struct TestVFO {
~TestVFO() {
if (!Contents)
return;
CXString Buf;
clang_VirtualFileOverlay_writeToBuffer(VFO, 0, &Buf);
EXPECT_STREQ(Contents, clang_getCString(Buf));
clang_disposeString(Buf);
char *BufPtr;
unsigned BufSize;
clang_VirtualFileOverlay_writeToBuffer(VFO, 0, &BufPtr, &BufSize);
std::string BufStr(BufPtr, BufSize);
EXPECT_STREQ(Contents, BufStr.c_str());
free(BufPtr);
clang_VirtualFileOverlay_dispose(VFO);
}
};