From ed64d68d55dd32b1cf57d897869481c025da903c Mon Sep 17 00:00:00 2001
From: John Marshall <john.marshall@sanger.ac.uk>
Date: Tue, 18 Mar 2014 10:48:05 +0000
Subject: [PATCH] Miscellaneous portability / warning fixes
Remove extra parentheses that clang thinks are there to prevent a
different warning for "if (numConsumedByB = 0) /*assignment intended*/".
Use 0 instead of NULL to initialise non-pointers.
Only const *integral or enumeration* static data members can be portably
initialised within the class definition.
---
src/subtractBed/subtractBed.cpp | 2 +-
src/utils/Fasta/Fasta.cpp | 6 +++---
src/utils/fileType/FileRecordTypeChecker.cpp | 1 +
src/utils/fileType/FileRecordTypeChecker.h | 2 --
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/subtractBed/subtractBed.cpp b/src/subtractBed/subtractBed.cpp
index d46ce8c0..1a9cac9e 100644
--- a/src/subtractBed/subtractBed.cpp
+++ b/src/subtractBed/subtractBed.cpp
@@ -123,7 +123,7 @@ void BedSubtract::FindAndSubtractOverlaps(BED &a, vector<BED> &hits) {
vector<bool> aKeep(a.end - a.start, true);
- if ((numConsumedByB == 0)) {
+ if (numConsumedByB == 0) {
if(_removeAll){ return; }
// if there's any overlap, then we don't report.
diff --git a/src/utils/Fasta/Fasta.cpp b/src/utils/Fasta/Fasta.cpp
index 076f06d2..be9e53e8 100644
--- a/src/utils/Fasta/Fasta.cpp
+++ b/src/utils/Fasta/Fasta.cpp
@@ -26,11 +26,11 @@ FastaIndexEntry::~FastaIndexEntry(void)
void FastaIndexEntry::clear(void)
{
name = "";
- length = NULL;
+ length = 0;
offset = -1; // no real offset will ever be below 0, so this allows us to
// check if we have already recorded a real offset
- line_blen = NULL;
- line_len = NULL;
+ line_blen = 0;
+ line_len = 0;
useFullHeader = false;
}
diff --git a/src/utils/fileType/FileRecordTypeChecker.cpp b/src/utils/fileType/FileRecordTypeChecker.cpp
index 8ac393b2..f2450891 100644
--- a/src/utils/fileType/FileRecordTypeChecker.cpp
+++ b/src/utils/fileType/FileRecordTypeChecker.cpp
@@ -110,6 +110,7 @@ bool FileRecordTypeChecker::isBinaryBuffer(const char *buffer, size_t len)
//Let's say that in a text file, at least 90% of the characters
//should be alphanumeric, whitespace, or punctuation.
+ static const float PERCENTAGE_PRINTABLE = .9;
int alphaNumCount = 0;
int whiteSpaceCount = 0;
diff --git a/src/utils/fileType/FileRecordTypeChecker.h b/src/utils/fileType/FileRecordTypeChecker.h
index 0a1ec8b6..45dcac7a 100644
--- a/src/utils/fileType/FileRecordTypeChecker.h
+++ b/src/utils/fileType/FileRecordTypeChecker.h
@@ -116,8 +116,6 @@ private:
bool _eofHit;
- //this will be used in determining whether we are looking at a binary or text file.
- static const float PERCENTAGE_PRINTABLE = .9;
bool isBinaryBuffer(const char *buffer, size_t len);
bool isBAM(const char *buffer);
bool handleTextFormat(const char *buffer, size_t len);
--
GitLab