adjustments to log output

sjlombardo · sjlombardo · commit 9732b7e1f93a · 2022-02-27T07:52:26.000-05:00
diff --git a/src/crypto.h b/src/crypto.h
@@ -312,7 +312,8 @@ void sqlcipher_log(unsigned int tag, const char *message, ...);
 #define SQLCIPHER_LOG_WARN          0x02
 #define SQLCIPHER_LOG_INFO          0x04
 #define SQLCIPHER_LOG_DEBUG         0x08
-#define SQLCIPHER_LOG_TRACE         0xffffffff
+#define SQLCIPHER_LOG_TRACE         0x10
+#define SQLCIPHER_LOG_ALL           0xffffffff
 
 void sqlcipher_vdbe_return_string(Parse*, const char*, const char*, int);
 
diff --git a/src/crypto_impl.c b/src/crypto_impl.c
@@ -1727,7 +1727,7 @@ void sqlcipher_log(unsigned int level, const char *message, ...) {
     goto end;
   }
   if(sqlcipher_log_file != NULL){
-    char buffer[256];
+    char buffer[24];
     struct tm tt;
     int ms;
     time_t sec;
@@ -1746,11 +1746,11 @@ void sqlcipher_log(unsigned int level, const char *message, ...) {
     ms = tv.tv_usec/1000.0;
     localtime_r(&sec, &tt);
 #endif
-    sqlcipher_memset(buffer, 0, 256);
-    strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", &tt);
-    fprintf((FILE*)sqlcipher_log_file, "%s.%03d: ", buffer, ms);
-    vfprintf((FILE*)sqlcipher_log_file, message, params);
-    fprintf((FILE*)sqlcipher_log_file, "\n");
+    if(strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", &tt)) {
+      fprintf((FILE*)sqlcipher_log_file, "%s.%03d: ", buffer, ms);
+      vfprintf((FILE*)sqlcipher_log_file, message, params);
+      fprintf((FILE*)sqlcipher_log_file, "\n");
+    }
   }
 #ifdef __ANDROID__
   if(sqlcipher_log_logcat) {
