wolfSSL: Use LIBWOLFSSL_VERSION_HEX to decide whether or not to use WOLFSSL_X509_V_OK

[privoxy.git] / errlog.c

diff --git a/errlog.c b/errlog.c
index 969c0bd..27bb4e0 100644 (file)
--- a/errlog.c
+++ b/errlog.c
@@ -583,7 +583,7 @@ static const char *get_log_level_string(int loglevel)
       case LOG_LEVEL_CONNECT:
          log_level_string = "Connect";
          break;
-     case LOG_LEVEL_TAGGING:
+      case LOG_LEVEL_TAGGING:
          log_level_string = "Tagging";
          break;
       case LOG_LEVEL_WRITING:
@@ -659,11 +659,11 @@ void log_error(int loglevel, const char *fmt, ...)
 
 #if defined(_WIN32) && !defined(_WIN_CONSOLE)
    /*
-    * Irrespective of debug setting, a GET/POST/CONNECT makes
-    * the taskbar icon animate.  (There is an option to disable
-    * this but checking that is handled inside LogShowActivity()).
+    * Irrespective of debug setting, a request makes the taskbar icon
+    * animate. (There is an option to disable this but checking that is
+    * handled inside LogShowActivity()).
     */
-   if ((loglevel == LOG_LEVEL_REQUEST) || (loglevel == LOG_LEVEL_CRUNCH))
+   if (loglevel == LOG_LEVEL_REQUEST)
    {
       LogShowActivity();
    }
@@ -683,6 +683,10 @@ void log_error(int loglevel, const char *fmt, ...)
 #ifdef FUZZ
       if (debug == LOG_LEVEL_STFU)
       {
+         if (loglevel == LOG_LEVEL_FATAL)
+         {
+            exit(1);
+         }
          return;
       }
 #endif
@@ -815,7 +819,10 @@ void log_error(int loglevel, const char *fmt, ...)
                   int ret = snprintf(outbuf + length,
                      log_buffer_size - length - 2, "\\x%.2x", (unsigned char)*sval);
                   assert(ret == 4);
-                  length += 4;
+                  if (ret == 4)
+                  {
+                     length += 4;
+                  }
                }
                sval++;
             }