clang-format code before code review

Author: lavarou

agent/lib_composer.c

@@ -76,7 +76,8 @@ static void nr_execute_handle_autoload_composer_get_packages_information(
 
   // nurunlikely because this should alredy be ensured by the caller
   if (nrunlikely(!NRINI(vulnerability_management_package_detection_enabled))) {
-    // do nothing when collecting package information for vulnerability management is disabled
+    // do nothing when collecting package information for vulnerability
+    // management is disabled
     return;
   }
 
@@ -86,6 +87,7 @@ static void nr_execute_handle_autoload_composer_get_packages_information(
     return;
   }
 
+  // clang-format off
   char* getallrawdata
         = ""
         "(function() {"
@@ -107,6 +109,7 @@ static void nr_execute_handle_autoload_composer_get_packages_information(
         "    return NULL;"
         "  }"
         "})();";
+  // clang-format on
 
   if (NR_SUCCESS != nr_execute_handle_autoload_composer_init(vendor_path)) {
     nrl_debug(NRL_INSTRUMENT,
@@ -119,30 +122,35 @@ static void nr_execute_handle_autoload_composer_get_packages_information(
   nrl_verbosedebug(NRL_INSTRUMENT, "%s - Composer runtime API available",
                    __func__);
 
-  result = zend_eval_string(getallrawdata, &retval, "composer_getallrawdata.php");
+  result
+      = zend_eval_string(getallrawdata, &retval, "composer_getallrawdata.php");
   if (SUCCESS != result) {
-    nrl_verbosedebug(NRL_INSTRUMENT, "%s - composer_getallrawdata.php failed", __func__);
+    nrl_verbosedebug(NRL_INSTRUMENT, "%s - composer_getallrawdata.php failed",
+                     __func__);
     return;
   }
   if (IS_ARRAY == Z_TYPE(retval)) {
     zend_string* package_name = NULL;
     zval* package_version = NULL;
-    ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL(retval), package_name, package_version) {
+    ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL(retval), package_name,
+                                  package_version) {
       if (NULL == package_name || NULL == package_version) {
         continue;
       }
       if (nr_php_is_zval_non_empty_string(package_version)) {
         nrl_verbosedebug(NRL_INSTRUMENT, "package %s, version %s",
                          NRSAFESTR(ZSTR_VAL(package_name)),
                          NRSAFESTR(Z_STRVAL_P(package_version)));
-        nr_txn_add_php_package_from_source(NRPRG(txn), NRSAFESTR(ZSTR_VAL(package_name)),
-                            NRSAFESTR(Z_STRVAL_P(package_version)), NR_PHP_PACKAGE_SOURCE_COMPOSER);
+        nr_txn_add_php_package_from_source(
+            NRPRG(txn), NRSAFESTR(ZSTR_VAL(package_name)),
+            NRSAFESTR(Z_STRVAL_P(package_version)),
+            NR_PHP_PACKAGE_SOURCE_COMPOSER);
       }
     }
     ZEND_HASH_FOREACH_END();
   } else {
-    nrl_verbosedebug(NRL_INSTRUMENT,
-                     "%s - installed packages is not an array", __func__);
+    nrl_verbosedebug(NRL_INSTRUMENT, "%s - installed packages is not an array",
+                     __func__);
   }
   zval_dtor(&retval);
 }

agent/php_execute.c

@@ -931,7 +931,8 @@ static void nr_execute_handle_library(const char* filename,
   }
 }
 
-static void nr_execute_handle_autoload(const char* filename, const size_t filename_len) {
+static void nr_execute_handle_autoload(const char* filename,
+                                       const size_t filename_len) {
 #define AUTOLOAD_MAGIC_FILE "vendor/autoload.php"
 #define AUTOLOAD_MAGIC_FILE_LEN (sizeof(AUTOLOAD_MAGIC_FILE) - 1)
 
@@ -950,12 +951,14 @@ static void nr_execute_handle_autoload(const char* filename, const size_t filena
     return;
   }
 
-  if (!nr_striendswith(STR_AND_LEN(filename), AUTOLOAD_MAGIC_FILE, AUTOLOAD_MAGIC_FILE_LEN)) {
+  if (!nr_striendswith(STR_AND_LEN(filename), AUTOLOAD_MAGIC_FILE,
+                       AUTOLOAD_MAGIC_FILE_LEN)) {
     // not an autoload file
     return;
   }
 
-  nrl_debug(NRL_FRAMEWORK, "detected autoload with %s, which ends with %s", filename, AUTOLOAD_MAGIC_FILE);
+  nrl_debug(NRL_FRAMEWORK, "detected autoload with %s, which ends with %s",
+            filename, AUTOLOAD_MAGIC_FILE);
   NRPRG(txn)->composer_info.autoload_detected = true;
   nr_fw_support_add_library_supportability_metric(NRPRG(txn), "Autoloader");