feedback

Author: ZNeumann

agent/php_mysqli.c

@@ -689,7 +689,7 @@ const char* nr_php_mysqli_strip_persistent_prefix(const char* host) {
   return host;
 }
 
-void nr_mysqli_rshutdown() {
+void nr_php_mysqli_rshutdown() {
   /*
    * This frees mysqli metadata stored in the transaction.
    *

agent/php_mysqli.h

@@ -167,6 +167,6 @@ extern void nr_php_mysqli_remove_datastore_instance(
  * Purpose : Frees reference incremented, transaction global zvals
  *           that must be cleaned up prior to postdeactivate
  */
-extern void nr_mysqli_rshutdown();
+extern void nr_php_mysqli_rshutdown();
 
 #endif /* PHP_MYSQLI_HDR */

agent/php_pdo.c

@@ -639,7 +639,7 @@ zval* nr_php_pdo_disable_persistence(const zval* options TSRMLS_DC) {
   return result;
 }
 
-void nr_pdo_rshutdown() {
+void nr_php_pdo_rshutdown() {
   /*
    * This frees pdo metadata stored in the transaction.
    *

agent/php_pdo.h

@@ -165,5 +165,5 @@ extern void nr_php_pdo_free_data_sources(struct pdo_data_src_parser* parsed,
  * Purpose : Frees reference incremented, transaction global zvals
  *           that must be cleaned up prior to postdeactivate
  */
-extern void nr_pdo_rshutdown();
+extern void nr_php_pdo_rshutdown();
 #endif

agent/php_rshutdown.c

@@ -12,6 +12,8 @@
 #include "php_globals.h"
 #include "php_user_instrument.h"
 #include "php_wrapper.h"
+#include "php_mysqli.h"
+#include "php_pdo.h"
 #include "util_logging.h"
 #include "lib_guzzle4.h"
 
@@ -49,8 +51,8 @@ PHP_RSHUTDOWN_FUNCTION(newrelic) {
 
   nr_guzzle4_rshutdown(TSRMLS_C);
   nr_curl_rshutdown(TSRMLS_C);
-  nr_pdo_rshutdown();
-  nr_mysqli_rshutdown();
+  nr_php_pdo_rshutdown();
+  nr_php_mysqli_rshutdown();
 
   nrl_verbosedebug(NRL_INIT, "RSHUTDOWN processing done");