Cosmetic changes, as per Nick's review.

llvm-svn: 140785
This commit is contained in:
Devang Patel 2011-09-29 16:46:47 +00:00
parent fbf3eb2e3e
commit 204df6030c
5 changed files with 17 additions and 21 deletions

View File

@ -20,6 +20,7 @@
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/Function.h"
#include <vector>
using namespace llvm;

View File

@ -10,12 +10,11 @@
// GCOVReader implements the interface to read coverage files that use 'gcov'
// format.
//
//
//===----------------------------------------------------------------------===//
#include "GCOVReader.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/Support/MemoryObject.h"
#include "llvm/Support/system_error.h"
using namespace llvm;
@ -35,16 +34,16 @@ bool GCOVFile::read(GCOVBuffer &Buffer) {
return false;
unsigned i = 0;
while(1) {
while (1) {
GCOVFunction *GFun = NULL;
if(Format == GCDA_402 || Format == GCDA_404) {
if (Format == GCDA_402 || Format == GCDA_404) {
if (i < Functions.size())
GFun = Functions[i];
} else
GFun = new GCOVFunction();
if (GFun && GFun->read(Buffer, Format)) {
if(Format == GCNO_402 || Format == GCNO_404)
if (Format == GCNO_402 || Format == GCNO_404)
Functions.push_back(GFun);
}
else {
@ -93,10 +92,10 @@ bool GCOVFunction::read(GCOVBuffer &Buff, GCOVFormat Format) {
Buff.readInt(); // Checksum #2
Name = Buff.readString();
if(Format == GCNO_402 || Format == GCNO_404)
if (Format == GCNO_402 || Format == GCNO_404)
Filename = Buff.readString();
if(Format == GCDA_402 || Format == GCDA_404) {
if (Format == GCDA_402 || Format == GCDA_404) {
Buff.readArcTag();
uint32_t Count = Buff.readInt() / 2;
for (unsigned i = 0, e = Count; i != e; ++i) {

View File

@ -1,4 +1,4 @@
//===-- tools/cov/GCOVReader.h - LLVM coverage tool -------------*- C++ -*-===//
//===-- tools/llvm-cov/GCOVReader.h - LLVM coverage tool --------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//

View File

@ -1,4 +1,4 @@
##===- tools/llvm-gcov/Makefile ----------------------------*- Makefile -*-===##
##===- tools/llvm-cov/Makefile -----------------------------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#

View File

@ -7,10 +7,8 @@
//
//===----------------------------------------------------------------------===//
//
//
// llvm-cov is a command line tools to analyze and report coverage information.
//
//
//===----------------------------------------------------------------------===//
#include "GCOVReader.h"
@ -47,27 +45,25 @@ int main(int argc, char **argv) {
if (InputGCNO.empty())
errs() << " " << argv[0] << ": No gcov input file!\n";
OwningPtr<MemoryBuffer> Buff;
if (error_code ec = MemoryBuffer::getFileOrSTDIN(InputGCNO, Buff)) {
OwningPtr<MemoryBuffer> GCNO_Buff;
if (error_code ec = MemoryBuffer::getFileOrSTDIN(InputGCNO, GCNO_Buff)) {
errs() << InputGCNO << ": " << ec.message() << "\n";
return 1;
}
GCOVBuffer GB(Buff.take());
if (!GF.read(GB)) {
GCOVBuffer GCNO_GB(GCNO_Buff.take());
if (!GF.read(GCNO_GB)) {
errs() << "Invalid .gcno File!\n";
return 1;
}
if (!InputGCDA.empty()) {
OwningPtr<MemoryBuffer> Buff2;
if (error_code ec = MemoryBuffer::getFileOrSTDIN(InputGCDA, Buff2)) {
OwningPtr<MemoryBuffer> GCDA_Buff;
if (error_code ec = MemoryBuffer::getFileOrSTDIN(InputGCDA, GCDA_Buff)) {
errs() << InputGCDA << ": " << ec.message() << "\n";
return 1;
}
GCOVBuffer GB2(Buff2.take());
if (!GF.read(GB2)) {
GCOVBuffer GCDA_GB(GCDA_Buff.take());
if (!GF.read(GCDA_GB)) {
errs() << "Invalid .gcda File!\n";
return 1;
}