1 files changed, 117 insertions, 129 deletions

diff --git a/common/log.cc b/common/log.cc
index 00e1765f..7a411fb2 100644
--- a/common/log.cc
+++ b/common/log.cc
@@ -17,27 +17,27 @@
  *
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <vector>
 #include <list>
 #include <map>
 #include <set>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <vector>
 
-#include "log.h"
 #include "design.h"
+#include "log.h"
 
-std::vector<FILE*>				log_files;
-std::vector<std::ostream*>			log_streams;
-FILE		*log_errfile   = NULL;
+std::vector<FILE *> log_files;
+std::vector<std::ostream *> log_streams;
+FILE *log_errfile = NULL;
 
-bool		log_error_stderr    = false;
-bool		log_cmd_error_throw = false;
-bool		log_quiet_warnings  = false;
-int		log_verbose_level;
-std::string	log_last_error;
+bool log_error_stderr = false;
+bool log_cmd_error_throw = false;
+bool log_quiet_warnings = false;
+int log_verbose_level;
+std::string log_last_error;
 void (*log_error_atexit)() = NULL;
 
 static bool next_print_log = false;
@@ -45,204 +45,192 @@ static int log_newline_count = 0;
 
 std::string vstringf(const char *fmt, va_list ap)
 {
-	std::string string;
-	char *str = NULL;
+    std::string string;
+    char *str = NULL;
 
 #ifdef _WIN32
-	int sz = 64+strlen(fmt), rc;
-	while (1) {
-		va_list	apc;
-		va_copy(apc, ap);
-		str = (char*)realloc(str, sz);
-		rc = vsnprintf(str, sz, fmt, apc);
-		va_end(apc);
-		if (rc >= 0 && rc < sz)
-			break;
-		sz *= 2;
-	}
+    int sz = 64 + strlen(fmt), rc;
+    while (1) {
+        va_list apc;
+        va_copy(apc, ap);
+        str = (char *)realloc(str, sz);
+        rc = vsnprintf(str, sz, fmt, apc);
+        va_end(apc);
+        if (rc >= 0 && rc < sz)
+            break;
+        sz *= 2;
+    }
 #else
-	if (vasprintf(&str, fmt, ap) < 0)
-		str = NULL;
+    if (vasprintf(&str, fmt, ap) < 0)
+        str = NULL;
 #endif
 
-	if (str != NULL) {
-		string = str;
-		free(str);
-	}
+    if (str != NULL) {
+        string = str;
+        free(str);
+    }
 
-	return string;
+    return string;
 }
 
 void logv(const char *format, va_list ap)
 {
-	//
-	// Trim newlines from the beginning
-	while (format[0] == '\n' && format[1] != 0) {
-		log("\n");
-		format++;
-	}
+    //
+    // Trim newlines from the beginning
+    while (format[0] == '\n' && format[1] != 0) {
+        log("\n");
+        format++;
+    }
 
-	std::string str = vstringf(format, ap);
+    std::string str = vstringf(format, ap);
 
-	if (str.empty())
-		return;
+    if (str.empty())
+        return;
 
-	size_t	nnl_pos = str.find_last_not_of('\n');
-	if (nnl_pos == std::string::npos)
-		log_newline_count += str.size();
-	else
-		log_newline_count = str.size() - nnl_pos - 1;
+    size_t nnl_pos = str.find_last_not_of('\n');
+    if (nnl_pos == std::string::npos)
+        log_newline_count += str.size();
+    else
+        log_newline_count = str.size() - nnl_pos - 1;
 
-	for (auto f : log_files)
-		fputs(str.c_str(), f);
+    for (auto f : log_files)
+        fputs(str.c_str(), f);
 
-	for (auto f : log_streams)
-		*f << str;
+    for (auto f : log_streams)
+        *f << str;
 }
 
 void logv_info(const char *format, va_list ap)
 {
-	std::string message = vstringf(format, ap);
+    std::string message = vstringf(format, ap);
 
-	log("Info: %s", message.c_str());
-	log_flush();
+    log("Info: %s", message.c_str());
+    log_flush();
 }
 
 void logv_warning(const char *format, va_list ap)
 {
-	std::string message = vstringf(format, ap);
+    std::string message = vstringf(format, ap);
 
-	log("Warning: %s", message.c_str());
-	log_flush();
+    log("Warning: %s", message.c_str());
+    log_flush();
 }
 
 void logv_warning_noprefix(const char *format, va_list ap)
 {
-	std::string message = vstringf(format, ap);
+    std::string message = vstringf(format, ap);
 
-	log("%s", message.c_str());
+    log("%s", message.c_str());
 }
 
 void logv_error(const char *format, va_list ap)
 {
 #ifdef EMSCRIPTEN
-	auto backup_log_files = log_files;
+    auto backup_log_files = log_files;
 #endif
 
-	if (log_errfile != NULL)
-		log_files.push_back(log_errfile);
+    if (log_errfile != NULL)
+        log_files.push_back(log_errfile);
 
-	if (log_error_stderr)
-		for (auto &f : log_files)
-			if (f == stdout)
-				f = stderr;
+    if (log_error_stderr)
+        for (auto &f : log_files)
+            if (f == stdout)
+                f = stderr;
 
-	log_last_error = vstringf(format, ap);
-	log("ERROR: %s", log_last_error.c_str());
-	log_flush();
+    log_last_error = vstringf(format, ap);
+    log("ERROR: %s", log_last_error.c_str());
+    log_flush();
 
-	if (log_error_atexit)
-		log_error_atexit();
+    if (log_error_atexit)
+        log_error_atexit();
 
 #ifdef EMSCRIPTEN
-	log_files = backup_log_files;
-	throw 0;
+    log_files = backup_log_files;
+    throw 0;
 #elif defined(_MSC_VER)
-	_exit(EXIT_FAILURE);
+    _exit(EXIT_FAILURE);
 #else
-	_Exit(EXIT_FAILURE);
+    _Exit(EXIT_FAILURE);
 #endif
 }
 
 void log(const char *format, ...)
 {
-	va_list ap;
-	va_start(ap, format);
-	logv(format, ap);
-	va_end(ap);
+    va_list ap;
+    va_start(ap, format);
+    logv(format, ap);
+    va_end(ap);
 }
 
 void log_info(const char *format, ...)
 {
-	va_list ap;
-	va_start(ap, format);
-	logv_info(format, ap);
-	va_end(ap);
+    va_list ap;
+    va_start(ap, format);
+    logv_info(format, ap);
+    va_end(ap);
 }
 
 void log_warning(const char *format, ...)
 {
-	va_list ap;
-	va_start(ap, format);
-	logv_warning(format, ap);
-	va_end(ap);
+    va_list ap;
+    va_start(ap, format);
+    logv_warning(format, ap);
+    va_end(ap);
 }
 
 void log_warning_noprefix(const char *format, ...)
 {
-	va_list ap;
-	va_start(ap, format);
-	logv_warning_noprefix(format, ap);
-	va_end(ap);
+    va_list ap;
+    va_start(ap, format);
+    logv_warning_noprefix(format, ap);
+    va_end(ap);
 }
 
 void log_error(const char *format, ...)
 {
-	va_list ap;
-	va_start(ap, format);
-	logv_error(format, ap);
+    va_list ap;
+    va_start(ap, format);
+    logv_error(format, ap);
 }
 
 void log_cmd_error(const char *format, ...)
 {
-	va_list ap;
-	va_start(ap, format);
+    va_list ap;
+    va_start(ap, format);
 
-	if (log_cmd_error_throw) {
-		log_last_error = vstringf(format, ap);
-		log("ERROR: %s", log_last_error.c_str());
-		log_flush();
-		throw log_cmd_error_exception();
-	}
+    if (log_cmd_error_throw) {
+        log_last_error = vstringf(format, ap);
+        log("ERROR: %s", log_last_error.c_str());
+        log_flush();
+        throw log_cmd_error_exception();
+    }
 
-	logv_error(format, ap);
+    logv_error(format, ap);
 }
 
 void log_spacer()
 {
-	if (log_newline_count < 2) log("\n");
-	if (log_newline_count < 2) log("\n");
+    if (log_newline_count < 2)
+        log("\n");
+    if (log_newline_count < 2)
+        log("\n");
 }
 
-void log_push()
-{
-}
+void log_push() {}
 
-void log_pop()
-{
-	log_flush();
-}
+void log_pop() { log_flush(); }
 
-void log_reset_stack()
-{
-	log_flush();
-}
+void log_reset_stack() { log_flush(); }
 
 void log_flush()
 {
-	for (auto f : log_files)
-		fflush(f);
+    for (auto f : log_files)
+        fflush(f);
 
-	for (auto f : log_streams)
-		f->flush();
-}
-
-void log_cell(CellInfo *cell, std::string indent)
-{
-}
-
-void log_net(NetInfo *net, std::string indent)
-{
+    for (auto f : log_streams)
+        f->flush();
 }
 
+void log_cell(CellInfo *cell, std::string indent) {}
 
+void log_net(NetInfo *net, std::string indent) {}