Optimization to reduce code

Author: padelsbach

include/wolfprovider/wp_logging.h

@@ -169,7 +169,7 @@ enum wolfProv_LogComponents {
     WP_LOG_QUERY    = 0x80000,  /* wolfprov_query operations */
     WP_LOG_TLS1_PRF = 0x100000, /* TLS1 PRF operations */
 
-    /* log all compoenents */
+    /* log all components */
     WP_LOG_COMPONENTS_ALL = (WP_LOG_RNG
                            | WP_LOG_DIGEST
                            | WP_LOG_MAC
@@ -200,7 +200,7 @@ enum wolfProv_LogComponents {
                            | WP_LOG_QUERY
                            | WP_LOG_TLS1_PRF),
 
-    /* default compoenents logged */
+    /* default components logged */
     WP_LOG_COMPONENTS_DEFAULT = WP_LOG_COMPONENTS_ALL
 };
 
@@ -237,11 +237,6 @@ int wolfProv_SetLogLevel(int levelMask);
 /* Set which components are logged, bitmask of wolfProv_LogComponents */
 int wolfProv_SetLogComponents(int componentMask);
 
-/* Initialize the logging system for file based logging */
-int wp_log_file_init(void);
-/* Cleanup the logging system for file based logging */
-void wp_log_file_cleanup(void);
-
 #ifdef WOLFPROV_DEBUG
 
 #define WOLFPROV_STRINGIZE_HELPER(x) #x

src/wp_logging.c

@@ -49,54 +49,8 @@ static int providerLogLevel = WP_LOG_LEVEL_ALL;
  * in wolfProv_LogComponents. Default components include all. */
 static int providerLogComponents = WP_LOG_COMPONENTS_ALL;
 
-#ifdef WOLFPROV_LOG_FILE
-/* Persistent file handle for logging to file */
-static XFILE* logFileHandle = NULL;
-#endif
-
 #endif /* WOLFPROV_DEBUG */
 
-/**
- * Initialize the persistent log file handle.
- * Called once during provider initialization.
- *
- * @return 0 on success, negative value on failure.
- */
-
-int wp_log_file_init(void)
-{
-#if defined(WOLFPROV_LOG_FILE) && defined(WOLFPROV_DEBUG)
-    if (logFileHandle == NULL) {
-        logFileHandle = XFOPEN(WOLFPROV_LOG_FILE, "a");
-        if (logFileHandle) {
-            XFPRINTF(stderr, "wolfProvider: Using log file %s\n", WOLFPROV_LOG_FILE);
-            fflush(stderr);
-        }
-        else  {
-            /* File open failed - will fall back to stderr on first log */
-            XFPRINTF(stderr, "wolfProvider: Failed to open log file %s\n", WOLFPROV_LOG_FILE);
-            return -1;
-        }
-    }
-#endif /* WOLFPROV_LOG_FILE && WOLFPROV_DEBUG */
-    return 0;
-}
-
-/**
- * Cleanup the persistent log file handle.
- * Called during provider teardown.
- */
-void wp_log_file_cleanup(void)
-{
-#if defined(WOLFPROV_LOG_FILE) && defined(WOLFPROV_DEBUG)
-    if (logFileHandle != NULL) {
-        XFPRINTF(stderr, "wolfProvider: Closing log file %s\n", WOLFPROV_LOG_FILE);
-        XFCLOSE(logFileHandle);
-        logFileHandle = NULL;
-    }
-#endif /* WOLFPROV_LOG_FILE && WOLFPROV_DEBUG */
-}
-
 /**
  * Registers wolfProv logging callback.
  * Callback will be used by wolfProv for debug/log messages.
@@ -220,24 +174,33 @@ static void wolfprovider_log(const int logLevel, const int component,
         printf("%s\n", logMessage);
 #elif defined(WOLFPROV_LOG_FILE)
         {
+            /* Persistent file handle for logging to file */
+            static XFILE* logFileHandle = NULL;
             /* Flag to track if we've already reported file open failure to avoid spam */
             static int logFileErrorReported = 0;
 
-            if (logFileHandle != NULL) {
-                XFWRITE(logMessage, strlen(logMessage), 1, logFileHandle);
-                XFWRITE("\n", 1, 1, logFileHandle);
-                XFFLUSH(logFileHandle);
-            } else {
-                /* Only report file error once to avoid spam */
-                if (!logFileErrorReported) {
-                    XFPRINTF(stderr, "wolfProvider: Log file not open: %s, "
-                            "falling back to stderr\n", 
-                        WOLFPROV_LOG_FILE);
-                    logFileErrorReported = 1;
+            if (logFileHandle == NULL) {
+                logFileHandle = XFOPEN(WOLFPROV_LOG_FILE, "a");
+                if (logFileHandle) {
+                    XFPRINTF(stderr, "wolfProvider: Using log file %s\n", WOLFPROV_LOG_FILE);
+                    fflush(stderr);
+                }
+                else {
+                    /* Fall back to stderr when file open fails */
+                    logFileHandle = stderr;
+                    /* Only report file error once to avoid spam */
+                    if (!logFileErrorReported) {
+                        logFileErrorReported = 1;
+                        XFPRINTF(stderr, "wolfProvider: Log file not open: %s, "
+                                "falling back to stderr\n", 
+                            WOLFPROV_LOG_FILE);
+                    }
                 }
-                XFWRITE(logMessage, strlen(logMessage), 1, stderr);
-                XFWRITE("\n", 1, 1, stderr);
             }
+            
+            XFWRITE(logMessage, strlen(logMessage), 1, logFileHandle);
+            XFWRITE("\n", 1, 1, logFileHandle);
+            XFFLUSH(logFileHandle);
         }
 #else
         XFPRINTF(stderr, "%s\n", logMessage);

src/wp_wolfprov.c

@@ -1178,7 +1178,6 @@ static const OSSL_ALGORITHM* wolfprov_query(void* provCtx, int id,
  */
 static void wolfprov_teardown(void* provCtx)
 {
-    wp_log_file_cleanup();
     wolfssl_prov_ctx_free(provCtx);
 }
 
@@ -1236,8 +1235,6 @@ int wolfssl_provider_init(const OSSL_CORE_HANDLE* handle,
 {
     int ok = 1;
 
-    wp_log_file_init();
-
     WOLFPROV_ENTER(WP_LOG_PROVIDER, "wolfssl_provider_init");
 
 #ifdef WOLFPROV_DEBUG