Update layout.

Author: jonsimantov

analytics/generate_windows_stubs.py

@@ -152,20 +152,20 @@ def generate_function_pointers(dll_file_path, header_file_path, output_h_path, o
         f.write("\n\n")
         f.write("\n".join(macro_definitions))
         f.write("\n// clang-format on\n")
-        f.write("\n\n// --- Dynamic Loader Declaration for Windows ---\n")
+        f.write("\n// --- Dynamic Loader Declaration for Windows ---\n")
         f.write("#if defined(_WIN32)\n")
-        f.write('#include <windows.h> // For HMODULE\n')
+        f.write('#include <windows.h>\n')
         f.write(f'\n// Google Analytics Windows DLL SHA256 hash, to be verified on load.')
         f.write(f'\nextern const unsigned char FirebaseAnalytics_WindowsDllHash[{len(dll_hash)}];\n');
 
         f.write(f'\n// Number of Google Analytics functions expected to be loaded from the DLL.')
         f.write(f'\n#define FIREBASE_ANALYTICS_DYNAMIC_FUNCTION_COUNT {len(function_details_for_loader)}\n\n')
-        f.write('// Load Google Analytics functions from the given DLL handle into function pointers.\n')
-        f.write(f'// Returns the number of functions successfully loaded (out of FIREBASE_ANALYTICS_DYNAMIC_FUNCTION_COUNT).\n')
+        f.write('// Load Analytics functions from the given DLL handle into function pointers.\n')
+        f.write(f'// Returns the number of functions successfully loaded (out of\nFIREBASE_ANALYTICS_DYNAMIC_FUNCTION_COUNT).\n')
         f.write("int FirebaseAnalytics_LoadDynamicFunctions(HMODULE dll_handle);\n\n")
         f.write('// Reset all function pointers back to stubs.\n')
         f.write("void FirebaseAnalytics_UnloadDynamicFunctions(void);\n\n")
-        f.write("#endif // defined(_WIN32)\n")
+        f.write("#endif  // defined(_WIN32)\n")
         f.write("\n#ifdef __cplusplus\n")
         f.write("}\n")
         f.write("#endif\n\n")
@@ -177,14 +177,14 @@ def generate_function_pointers(dll_file_path, header_file_path, output_h_path, o
     with open(output_c_path, 'w', encoding='utf-8') as f:
         f.write(f"{COPYRIGHT_NOTICE}")
         f.write(f"// Generated from {os.path.basename(header_file_path)} by {os.path.basename(sys.argv[0])}\n\n")
-        f.write(f'#include "{INCLUDE_PREFIX}{os.path.basename(output_h_path)}"\n')
+        f.write(f'#include "{INCLUDE_PREFIX}{os.path.basename(output_h_path)}"\n\n')
         f.write('#include <stddef.h>\n\n')
-        f.write('// Google Analytics Windows DLL SHA256 hash, to be verified on load.\n')
-        f.write('const unsigned char FirebaseAnalytics_WindowsDllHash[] = {')
-        f.write(','.join(["0x%02x" % s for s in dll_hash]))
-        f.write('};\n\n')
-        f.write("// clang-format off\n\n")
         f.write("static void* g_stub_memory = NULL;\n\n")
+        f.write("// clang-format off\n\n")
+        f.write('// Google Analytics Windows DLL SHA256 hash, to be verified on load.\n')
+        f.write('const unsigned char FirebaseAnalytics_WindowsDllHash[] = {\n    ')
+        f.write(', '.join(["0x%02x" % s for s in dll_hash]))
+        f.write('\n};\n\n')
         f.write("// --- Stub Function Definitions ---\n")
         f.write("\n\n".join(stub_functions))
         f.write("\n\n\n// --- Function Pointer Initializations ---\n")

analytics/src/analytics_desktop.cc

@@ -37,7 +37,7 @@ namespace analytics {
 #define ANALYTICS_DLL_FILENAME L"analytics_win.dll"
 
 static HMODULE g_analytics_module = 0;
-#endif   // defined(_WIN32)
+#endif  // defined(_WIN32)
 
 // Future data for analytics.
 // This is initialized in `Initialize()` and cleaned up in `Terminate()`.

analytics/src/analytics_desktop_dynamic.c

@@ -15,14 +15,17 @@
 // Generated from analytics.h by generate_windows_stubs.py
 
 #include "analytics/src/analytics_desktop_dynamic.h"
+
 #include <stddef.h>
 
-// Google Analytics Windows DLL SHA256 hash, to be verified on load.
-const unsigned char FirebaseAnalytics_WindowsDllHash[] = {0xc1,0xb9,0xff,0x6e,0x91,0x19,0xc3,0x0b,0xbe,0xb7,0x47,0x23,0x26,0xdc,0xde,0x41,0x8f,0x45,0x68,0x2e,0x6b,0x82,0x2e,0x25,0xee,0xd9,0x22,0xfe,0x6e,0x3c,0xc6,0x98};
+static void* g_stub_memory = NULL;
 
 // clang-format off
 
-static void* g_stub_memory = NULL;
+// Google Analytics Windows DLL SHA256 hash, to be verified on load.
+const unsigned char FirebaseAnalytics_WindowsDllHash[] = {
+    0xc1, 0xb9, 0xff, 0x6e, 0x91, 0x19, 0xc3, 0x0b, 0xbe, 0xb7, 0x47, 0x23, 0x26, 0xdc, 0xde, 0x41, 0x8f, 0x45, 0x68, 0x2e, 0x6b, 0x82, 0x2e, 0x25, 0xee, 0xd9, 0x22, 0xfe, 0x6e, 0x3c, 0xc6, 0x98
+};
 
 // --- Stub Function Definitions ---
 // Stub for GoogleAnalytics_Item_Create

analytics/src/analytics_desktop_dynamic.h

@@ -112,25 +112,25 @@ extern void (*ptr_GoogleAnalytics_SetAnalyticsCollectionEnabled)(bool enabled);
 #define GoogleAnalytics_SetAnalyticsCollectionEnabled ptr_GoogleAnalytics_SetAnalyticsCollectionEnabled
 // clang-format on
 
-
 // --- Dynamic Loader Declaration for Windows ---
 #if defined(_WIN32)
-#include <windows.h> // For HMODULE
+#include <windows.h>
 
 // Google Analytics Windows DLL SHA256 hash, to be verified on load.
 extern const unsigned char FirebaseAnalytics_WindowsDllHash[32];
 
 // Number of Google Analytics functions expected to be loaded from the DLL.
 #define FIREBASE_ANALYTICS_DYNAMIC_FUNCTION_COUNT 19
 
-// Load Google Analytics functions from the given DLL handle into function pointers.
-// Returns the number of functions successfully loaded (out of FIREBASE_ANALYTICS_DYNAMIC_FUNCTION_COUNT).
+// Load Analytics functions from the given DLL handle into function pointers.
+// Returns the number of functions successfully loaded (out of
+FIREBASE_ANALYTICS_DYNAMIC_FUNCTION_COUNT).
 int FirebaseAnalytics_LoadDynamicFunctions(HMODULE dll_handle);
 
 // Reset all function pointers back to stubs.
 void FirebaseAnalytics_UnloadDynamicFunctions(void);
 
-#endif // defined(_WIN32)
+#endif  // defined(_WIN32)
 
 #ifdef __cplusplus
 }