Fix a few issues

Author: mgreter

include/sass/compiler.h

@@ -154,7 +154,7 @@ extern "C" {
   ADDAPI const struct SassError* ADDCALL sass_compiler_get_error(struct SassCompiler* compiler);
 
   // Returns status code for compiler (0 meaning success, anything else is an error)
-  ADDAPI const int ADDCALL sass_compiler_get_status(struct SassCompiler* compiler);
+  ADDAPI int ADDCALL sass_compiler_get_status(struct SassCompiler* compiler);
 
   /////////////////////////////////////////////////////////////////////////
   /////////////////////////////////////////////////////////////////////////

src/capi_compiler.cpp

@@ -23,13 +23,14 @@ namespace Sass {
     formatted << "Error: ";
     // Add message and ensure it is
     // added with a final line-feed.
-    if (what != nullptr) {
-      formatted << what;
-      while (*what) {
+    const char* msg = what;
+    if (msg != nullptr) {
+      formatted << msg;
+      while (*msg) {
         has_final_lf =
-          *what == '\r' ||
-          *what == '\n';
-        ++what;
+          *msg == '\r' ||
+          *msg == '\n';
+        ++msg;
       }
       if (!has_final_lf) {
         formatted << STRMLF;
@@ -563,7 +564,7 @@ extern "C" {
   }
 
   // Returns status code for compiler (0 meaning success, anything else is an error)
-  const int ADDCALL sass_compiler_get_status(struct SassCompiler* compiler)
+  int ADDCALL sass_compiler_get_status(struct SassCompiler* compiler)
   {
     return Compiler::unwrap(compiler).error.status;
   }

src/logger.cpp

@@ -16,25 +16,31 @@ namespace Sass {
     columns(columns),
     style(style)
   {
-    setLogStyle(style);
+    setLogStyle(style, columns);
   }
 
-  void Logger::setLogStyle(enum SassLoggerStyle style)
+  void Logger::setLogStyle(enum SassLoggerStyle style, size_t columns)
   {
     // This auto-detection is experimental
     // We do our best but hard to make portable
-    if (this->style == SASS_LOGGER_AUTO) {
+    if (style == SASS_LOGGER_AUTO) {
       auto colors = Terminal::hasColorSupport(true);
       bool unicode = Terminal::hasUnicodeSupport(true);
       if (colors && unicode) { this->style = SASS_LOGGER_UNICODE_COLOR; }
       else if (unicode) { this->style = SASS_LOGGER_UNICODE_MONO; }
       else if (colors) { this->style = SASS_LOGGER_ASCII_COLOR; }
       else { this->style = SASS_LOGGER_ASCII_MONO; }
     }
+    else {
+      this->style = style;
+    }
     // Auto-detect available columns
     if (columns == NPOS) {
       this->columns = Terminal::getColumns(true);
     }
+    else {
+      this->columns = columns;
+    }
     // Clamp into a sensible range
     if (columns > 800) { columns = 800; }
     else if (columns < 40) { columns = 40; }

src/logger.hpp

@@ -92,9 +92,9 @@ namespace Sass {
     Logger(enum SassLoggerStyle style = SASS_LOGGER_ASCII_MONO,
       int precision = SassDefaultPrecision, size_t columns = NPOS);
 
-    void setLogPrecision(int precision);
+    void setLogStyle(enum SassLoggerStyle style, size_t columns = NPOS);
 
-    void setLogStyle(enum SassLoggerStyle style);
+    void setLogPrecision(int precision);
 
     void addWarning(const sass::string& message);