C++: Fix mixed tabs and spaces in non-test code

dave-bartolomeo · dave-bartolomeo · commit 5bf88f0f0aec · 2018-11-07T11:32:17.000-08:00
diff --git a/cpp/ql/src/Architecture/Refactoring Opportunities/FunctionsWithManyParameters.cpp b/cpp/ql/src/Architecture/Refactoring Opportunities/FunctionsWithManyParameters.cpp
@@ -4,5 +4,5 @@ void fillRect(int x, int y, int w, int h,
               int r2, int g2, int b2, int a2,
               gradient_type grad, unsigned int flags, bool border)
 {
-	// ...
+    // ...
 }
diff --git a/cpp/ql/src/Best Practices/Likely Errors/OffsetUseBeforeRangeCheck.c b/cpp/ql/src/Best Practices/Likely Errors/OffsetUseBeforeRangeCheck.c
@@ -1,7 +1,7 @@
 int find(int start, char *str, char goal)
 {
     int len = strlen(str);
-	//Potential buffer overflow
+    //Potential buffer overflow
     for (int i = start; str[i] != 0 && i < len; i++) { 
         if (str[i] == goal)
             return i; 
@@ -12,7 +12,7 @@ int find(int start, char *str, char goal)
 int findRangeCheck(int start, char *str, char goal)
 {
     int len = strlen(str);
-	//Range check protects against buffer overflow
+    //Range check protects against buffer overflow
     for (int i = start; i < len && str[i] != 0 ; i++) {
         if (str[i] == goal)
             return i; 
diff --git a/cpp/ql/src/Best Practices/Magic Constants/MagicConstantsNumbers.cpp b/cpp/ql/src/Best Practices/Magic Constants/MagicConstantsNumbers.cpp
@@ -1,16 +1,16 @@
 void sanitize(Fields[] record) {
     //The number of fields here can be put in a const
-	for (fieldCtr = 0; field < 7; field++) {
-		sanitize(fields[fieldCtr]);
-	}
+    for (fieldCtr = 0; field < 7; field++) {
+        sanitize(fields[fieldCtr]);
+    }
 }
 
 #define NUM_FIELDS 7
 
 void process(Fields[] record) {
-	//This avoids using a magic constant by using the macro instead
-	for (fieldCtr = 0; field < NUM_FIELDS; field++) {
-		process(fields[fieldCtr]);
-	}
+    //This avoids using a magic constant by using the macro instead
+    for (fieldCtr = 0; field < NUM_FIELDS; field++) {
+        process(fields[fieldCtr]);
+    }
 }
 
diff --git a/cpp/ql/src/Best Practices/Unused Entities/UnusedStaticFunctions.cpp b/cpp/ql/src/Best Practices/Unused Entities/UnusedStaticFunctions.cpp
@@ -1,14 +1,14 @@
 //start of file
 static void f() { //static function f() is unused in the file
-	//...
+    //...
 }
 static void g() {
-	//...
+    //...
 }
 void public_func() { //non-static function public_func is not called in file, 
                      //but could be visible in other files
-	//...
-	g(); //call to g()
-	//...
+    //...
+    g(); //call to g()
+    //...
 }
 //end of file
diff --git a/cpp/ql/src/Critical/LargeParameter.cpp b/cpp/ql/src/Critical/LargeParameter.cpp
@@ -1,13 +1,13 @@
 typedef struct Names {
-	char first[100];
-	char last[100];
+    char first[100];
+    char last[100];
 } Names;
 
 int doFoo(Names n) { //wrong: n is passed by value (meaning the entire structure
                      //is copied onto the stack, instead of just a pointer)
-	...
+    ...
 }
 
 int doBar(Names &n) { //better, only a reference is passed
-	...
+    ...
 }
diff --git a/cpp/ql/src/Critical/MissingNegativityTest.cpp b/cpp/ql/src/Critical/MissingNegativityTest.cpp
@@ -1,9 +1,9 @@
 Record records[SIZE] = ...;
 
 int f() {
-	int recordIdx = 0;
-	recordIdx = readUserInput(); //recordIdx is returned from a function
+    int recordIdx = 0;
+    recordIdx = readUserInput(); //recordIdx is returned from a function
         // there is no check so it could be negative
-	doFoo(&(records[recordIdx])); //but is not checked before use as an array offset
+    doFoo(&(records[recordIdx])); //but is not checked before use as an array offset
 }
 
diff --git a/cpp/ql/src/Likely Bugs/Likely Typos/BoolValueInBitOp.cpp b/cpp/ql/src/Likely Bugs/Likely Typos/BoolValueInBitOp.cpp
@@ -1,12 +1,12 @@
 if (!flags & SOME_BIT) { //wrong: '!' has higher precedence than '&', so this
-	                     // is bracketed as '(!flags) & SOME_BIT', and does not
-	                     // check whether a particular bit is set.
-	// ...
+                         // is bracketed as '(!flags) & SOME_BIT', and does not
+                         // check whether a particular bit is set.
+    // ...
 }
 
 if ((p != NULL) & p->f()) { //wrong: The use of '&' rather than '&&' will still
-	                        // de-reference the pointer even if it is NULL.
-	// ...
+                            // de-reference the pointer even if it is NULL.
+    // ...
 }
 
 int bits = (s > 8) & 0xff; //wrong: Invalid attempt to get the 8 most significant
diff --git a/cpp/ql/src/Likely Bugs/NestedLoopSameVar.cpp b/cpp/ql/src/Likely Bugs/NestedLoopSameVar.cpp
@@ -1,16 +1,16 @@
 int x1 = 0;
 for (x1 = 0; x1 < 100; x1++) {
-	int x2 = 0;
-	for (x1 = 0; x1 < 300; x1++) {
+    int x2 = 0;
+    for (x1 = 0; x1 < 300; x1++) {
     // this is most likely a typo
     // the outer loop will exit immediately
-	} 
+    } 
 }
 
 for (x1 = 0; x1 < 100; x1++) {
   if(x1 == 10 && condition) {
-  	for (; x1 < 75; x1++) {
+    for (; x1 < 75; x1++) {
       // this should be written as a while loop
-  	}   
+    }   
   }
 }
diff --git a/cpp/ql/src/Likely Bugs/OO/NonVirtualDestructor.cpp b/cpp/ql/src/Likely Bugs/OO/NonVirtualDestructor.cpp
@@ -1,31 +1,31 @@
 class Base {
 public:
-	Resource *p;
-	Base() {
-		p = createResource();
-	}
-	//...
-	~Base() {
-		//wrong: this destructor is non-virtual, but Base has a derived class
-                //       with a non-virtual destructor
-		freeResource(p);
-	}
+    Resource *p;
+    Base() {
+        p = createResource();
+    }
+    //...
+    ~Base() {
+        //wrong: this destructor is non-virtual, but Base has a derived class
+        //with a non-virtual destructor
+        freeResource(p);
+    }
 };
 
 class Derived: public Base {
 public:
-	Resource *dp;
-	Derived() {
-		dp = createResource2();
-	}
-	~Derived() {
-		freeResource2(dp);
-	}
+    Resource *dp;
+    Derived() {
+        dp = createResource2();
+    }
+    ~Derived() {
+        freeResource2(dp);
+    }
 };
 
 int f() {
-	Base *b = new Derived(); //creates resources for both Base::p and Derived::dp
-	//...
-	delete b; //will only call Base::~Base(), leaking the resource dp.
+    Base *b = new Derived(); //creates resources for both Base::p and Derived::dp
+    //...
+    delete b; //will only call Base::~Base(), leaking the resource dp.
         // Change both destructors to virtual to ensure they are both called.
 }
diff --git a/cpp/ql/src/Likely Bugs/OO/VirtualCallInStructor.cpp b/cpp/ql/src/Likely Bugs/OO/VirtualCallInStructor.cpp
@@ -1,35 +1,35 @@
 class Base {
 protected:
-	Resource* resource;
+    Resource* resource;
 public:
-	virtual void init() {
-		resource = createResource();
-	}
-	virtual void release() {
-		freeResource(resource);
-	}
+    virtual void init() {
+        resource = createResource();
+    }
+    virtual void release() {
+        freeResource(resource);
+    }
 };
 
 class Derived: public Base {
-	virtual void init() {
-		resource = createResourceV2();
-	}
-	virtual void release() {
-		freeResourceV2(resource);
-	}
+    virtual void init() {
+        resource = createResourceV2();
+    }
+    virtual void release() {
+        freeResourceV2(resource);
+    }
 };
 
 Base::Base() {
-	this->init();
+    this->init();
 }
 Base::~Base() {
-	this->release();
+    this->release();
 }
 
 int f() {
-	// this will call Base::Base() and then Derived::Derived(), but this->init()
-        // inBase::Base() will resolve to Base::init(), not Derived::init()
-	// The reason for this is that when Base::Base is called, the object being
-        // created is still of type Base (including the vtable)
-	Derived* d = new Derived();
+    // this will call Base::Base() and then Derived::Derived(), but this->init()
+    // inBase::Base() will resolve to Base::init(), not Derived::init()
+    // The reason for this is that when Base::Base is called, the object being
+    // created is still of type Base (including the vtable)
+    Derived* d = new Derived();
 }
diff --git a/cpp/ql/src/jsf/4.10 Classes/AV Rule 71.1.cpp b/cpp/ql/src/jsf/4.10 Classes/AV Rule 71.1.cpp
@@ -1,35 +1,35 @@
 class Base {
 protected:
-	Resource* resource;
+    Resource* resource;
 public:
-	virtual void init() {
-		resource = createResource();
-	}
-	virtual void release() {
-		freeResource(resource);
-	}
+    virtual void init() {
+        resource = createResource();
+    }
+    virtual void release() {
+        freeResource(resource);
+    }
 };
 
 class Derived: public Base {
-	virtual void init() {
-		resource = createResourceV2();
-	}
-	virtual void release() {
-		freeResourceV2(resource);
-	}
+    virtual void init() {
+        resource = createResourceV2();
+    }
+    virtual void release() {
+        freeResourceV2(resource);
+    }
 };
 
 Base::Base() {
-	this->init();
+    this->init();
 }
 Base::~Base() {
-	this->release();
+    this->release();
 }
 
 int f() {
-	// this will call Base::Base() and then Derived::Derived(), but this->init()
-        // inBase::Base() will resolve to Base::init(), not Derived::init()
-	// The reason for this is that when Base::Base is called, the object being
-        // created is still of type Base (including the vtable)
-	Derived* d = new Derived();
+    // this will call Base::Base() and then Derived::Derived(), but this->init()
+    // inBase::Base() will resolve to Base::init(), not Derived::init()
+    // The reason for this is that when Base::Base is called, the object being
+    // created is still of type Base (including the vtable)
+    Derived* d = new Derived();
 }
diff --git a/cpp/ql/src/jsf/4.10 Classes/AV Rule 77.1.cpp b/cpp/ql/src/jsf/4.10 Classes/AV Rule 77.1.cpp
@@ -1,13 +1,13 @@
 struct X {
-	//This struct will have a compiler-generated copy constructor
+    //This struct will have a compiler-generated copy constructor
     X(const X&, int);
     ...
 };
 
 //However, if this is declared later, it will override the compiler-generated
 //constructor
 X::X(const X& x, int i =0) {
-	this-> i = i; //uses the i parameter, instead of x.i
+    this-> i = i; //uses the i parameter, instead of x.i
 }
 
 C c(1);
diff --git a/cpp/ql/src/jsf/4.10 Classes/AV Rule 79.cpp b/cpp/ql/src/jsf/4.10 Classes/AV Rule 79.cpp
@@ -2,17 +2,17 @@
 // cannot close the file
 class ResourceLeak {
 private:
-	int sockfd;
-	FILE* file;
+    int sockfd;
+    FILE* file;
 public:
-	C() {
-		sockfd = socket(AF_INET, SOCK_STREAM, 0);
-	}
+    C() {
+        sockfd = socket(AF_INET, SOCK_STREAM, 0);
+    }
 
-	void f() {
-		file = fopen("foo.txt", "r");
-		...
-	}
+    void f() {
+        file = fopen("foo.txt", "r");
+        ...
+    }
 };
 
 // This class relies on its client to release any stream it
diff --git a/cpp/ql/src/jsf/4.10 Classes/AV Rule 88.cpp b/cpp/ql/src/jsf/4.10 Classes/AV Rule 88.cpp
@@ -6,13 +6,13 @@ class C : protected Superclass,
           public InterfaceA, public InterfaceB,
           private ImplementationA, private ImplementationB
 {
-	//implementation
+    //implementation
 };
 
 //wrong: multiple protected bases
 class D : protected Superclass1, protected Superclass2,
           public Interface, private Implementation
 {
-	//implementation
+    //implementation
 };
 
diff --git a/cpp/ql/src/semmle/code/cpp/PrintAST.qll b/cpp/ql/src/semmle/code/cpp/PrintAST.qll
@@ -542,5 +542,5 @@ query predicate edges(PrintASTNode source, PrintASTNode target, string key, stri
 }
 
 query predicate graphProperties(string key, string value) {
-	key = "semmle.graphKind" and value = "tree"
+  key = "semmle.graphKind" and value = "tree"
 }
diff --git a/cpp/ql/test/library-tests/exprs_cast/ExprsCast2.ql b/cpp/ql/test/library-tests/exprs_cast/ExprsCast2.ql
@@ -5,11 +5,11 @@
 import cpp
 
 string exprString(Expr e) {
-	if (e instanceof ArrayToPointerConversion) then (
-		result = e.(ArrayToPointerConversion).getExpr().(Literal).getValue()
-	) else (
-		result = e.toString()
-	)
+  if (e instanceof ArrayToPointerConversion) then (
+    result = e.(ArrayToPointerConversion).getExpr().(Literal).getValue()
+  ) else (
+    result = e.toString()
+  )
 }
 
 from Cast c, Type cType, string cTypeName, string toStruct
diff --git a/cpp/ql/test/library-tests/fields/fields/Fields.ql b/cpp/ql/test/library-tests/fields/fields/Fields.ql

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ void fillRect(int x, int y, int w, int h,`
`4`	`4`	`int r2, int g2, int b2, int a2,`
`5`	`5`	`gradient_type grad, unsigned int flags, bool border)`
`6`	`6`	`{`
`7`		`- // ...`
	`7`	`+ // ...`
`8`	`8`	`}`