6 files changed, 12 insertions, 15 deletions
diff --git a/src/core/lib/support/env.h b/src/core/lib/support/env.h
index e1c3bdc66a..e2c012a728 100644
--- a/src/core/lib/support/env.h
+++ b/src/core/lib/support/env.h
@@ -40,7 +40,7 @@ void gpr_setenv(const char *name, const char *value);
    use an insecure version of the function. It is ONLY to be used to solve the
    problem in which we need to check an env variable to configure the verbosity
    level of logging. So DO NOT USE THIS. */
-char *gpr_getenv_silent(const char *name, char** dst);
+const char *gpr_getenv_silent(const char *name, char **dst);
 
 #ifdef __cplusplus
 }
diff --git a/src/core/lib/support/env_linux.c b/src/core/lib/support/env_linux.c
index bc488e1b06..4c45a977ca 100644
--- a/src/core/lib/support/env_linux.c
+++ b/src/core/lib/support/env_linux.c
@@ -38,10 +38,10 @@
 
 #include "src/core/lib/support/string.h"
 
-char *gpr_getenv_silent(const char *name, char** dst) {
- char* insecure_func_used = NULL;
- char* result = NULL;
- #if defined(GPR_BACKWARDS_COMPATIBILITY_MODE)
+const char *gpr_getenv_silent(const char *name, char **dst) {
+  const char *insecure_func_used = NULL;
+  char *result = NULL;
+#if defined(GPR_BACKWARDS_COMPATIBILITY_MODE)
   typedef char *(*getenv_type)(const char *);
   static getenv_type getenv_func = NULL;
   /* Check to see which getenv variant is supported (go from most
@@ -65,11 +65,10 @@ char *gpr_getenv_silent(const char *name, char** dst) {
 }
 
 char *gpr_getenv(const char *name) {
-  char* result = NULL;
-  char* insecure_func_used = gpr_getenv_silent(name, &result);
+  char *result = NULL;
+  const char *insecure_func_used = gpr_getenv_silent(name, &result);
   if (insecure_func_used != NULL) {
-    gpr_log(GPR_DEBUG,
-            "Warning: insecure environment read function '%s' used",
+    gpr_log(GPR_DEBUG, "Warning: insecure environment read function '%s' used",
             insecure_func_used);
   }
   return result;
diff --git a/src/core/lib/support/env_posix.c b/src/core/lib/support/env_posix.c
index 8cc802ef88..b88822ca02 100644
--- a/src/core/lib/support/env_posix.c
+++ b/src/core/lib/support/env_posix.c
@@ -29,7 +29,7 @@
 #include <grpc/support/string_util.h>
 #include "src/core/lib/support/string.h"
 
-char *gpr_getenv_silent(const char *name, char **dst) {
+const char *gpr_getenv_silent(const char *name, char **dst) {
   *dst = gpr_getenv(name);
   return NULL;
 }
diff --git a/src/core/lib/support/env_windows.c b/src/core/lib/support/env_windows.c
index 557d5d6ad5..652eeb61c6 100644
--- a/src/core/lib/support/env_windows.c
+++ b/src/core/lib/support/env_windows.c
@@ -30,7 +30,7 @@
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 
-char *gpr_getenv_silent(const char *name, char **dst) {
+const char *gpr_getenv_silent(const char *name, char **dst) {
   *dst = gpr_getenv(name);
   return NULL;
 }
diff --git a/src/core/lib/support/log.c b/src/core/lib/support/log.c
index 010dc65d6a..fadb4d9a2c 100644
--- a/src/core/lib/support/log.c
+++ b/src/core/lib/support/log.c
@@ -65,7 +65,7 @@ void gpr_set_log_verbosity(gpr_log_severity min_severity_to_print) {
 
 void gpr_log_verbosity_init() {
   char *verbosity = NULL;
-  char *insecure_getenv = gpr_getenv_silent("GRPC_VERBOSITY", &verbosity);
+  const char *insecure_getenv = gpr_getenv_silent("GRPC_VERBOSITY", &verbosity);
 
   gpr_atm min_severity_to_print = GPR_LOG_SEVERITY_ERROR;
   if (verbosity != NULL) {
@@ -84,8 +84,7 @@ void gpr_log_verbosity_init() {
   }
 
   if (insecure_getenv != NULL) {
-    gpr_log(GPR_DEBUG,
-            "Warning: insecure environment read function '%s' used",
+    gpr_log(GPR_DEBUG, "Warning: insecure environment read function '%s' used",
             insecure_getenv);
   }
 }
diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc
index fa3b9cf766..200e477822 100644
--- a/src/cpp/server/server_builder.cc
+++ b/src/cpp/server/server_builder.cc
@@ -250,7 +250,6 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() {
       has_sync_methods && num_frequently_polled_cqs > 0;
 
   if (has_sync_methods) {
-
     grpc_cq_polling_type polling_type =
         is_hybrid_server ? GRPC_CQ_NON_POLLING : GRPC_CQ_DEFAULT_POLLING;