Index: driver/cfa.cc
===================================================================
--- driver/cfa.cc	(revision 0fa04a040608edf8bb8c9ef9bcf14e4f79b23feb)
+++ driver/cfa.cc	(revision 7f51b9dc349a76568aa4d3de2895e098988e60b4)
@@ -10,16 +10,16 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 13 17:22:02 2020
-// Update Count     : 435
+// Last Modified On : Fri Aug 14 07:22:03 2020
+// Update Count     : 437
 //
 
 #include <iostream>
-#include <cstdio>      // perror
-#include <cstdlib>     // putenv, exit
-#include <climits>     // PATH_MAX
-#include <unistd.h>    // execvp
-#include <string>      // STL version
-#include <string.h>    // strcmp
-#include <algorithm>   // find
+#include <cstdio>										// perror
+#include <cstdlib>										// putenv, exit
+#include <climits>										// PATH_MAX
+#include <unistd.h>										// execvp
+#include <string>										// STL version
+#include <string.h>										// strcmp
+#include <algorithm>									// find
 
 #include <sys/types.h>
@@ -36,8 +36,11 @@
 // #define __DEBUG_H__
 
+#define xstr(s) str(s)
+#define str(s) #s
+
 // "N__=" suffix
 static string __CFA_FLAGPREFIX__( "__CFA_FLAG" );
 
-void Putenv( char * argv[], string arg ) {
+static void Putenv( char * argv[], string arg ) {
 	// environment variables must have unique names
 	static int flags = 0;
@@ -49,10 +52,9 @@
 } // Putenv
 
-// check if string has prefix
-bool prefix( const string & arg, const string & pre ) {
+static bool prefix( const string & arg, const string & pre ) { // check if string has prefix
 	return arg.substr( 0, pre.size() ) == pre;
 } // prefix
 
-inline bool ends_with(const string & str, const string & sfix) {
+static inline bool ends_with(const string & str, const string & sfix) {
 	if (sfix.size() > str.size()) return false;
 	return std::equal(str.rbegin(), str.rbegin() + sfix.size(), sfix.rbegin(), sfix.rend());
@@ -60,5 +62,5 @@
 
 // check if string has suffix
-bool suffix( const string & arg ) {
+static bool suffix( const string & arg ) {
 	enum { NumSuffixes = 3 };
 	static const string suffixes[NumSuffixes] = { "cfa", "hfa", "ifa" };
@@ -70,5 +72,4 @@
 } // suffix
 
-
 static inline bool dirExists( const string & path ) {	// check if directory exists
     struct stat info;
@@ -79,5 +80,5 @@
 static inline string dir(const string & path) {
 	return path.substr(0, path.find_last_of('/'));
-}
+} // dir
 
 // Different path modes
@@ -118,7 +119,4 @@
 }
 
-
-#define xstr(s) str(s)
-#define str(s) #s
 
 int main( int argc, char * argv[] ) {