Skip to content

Commit 139072f

Browse files
committed
Const correct and clang
1 parent b9b376c commit 139072f

File tree

6 files changed

+12
-15
lines changed

6 files changed

+12
-15
lines changed

src/core/lib/support/env.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void gpr_setenv(const char *name, const char *value);
4040
use an insecure version of the function. It is ONLY to be used to solve the
4141
problem in which we need to check an env variable to configure the verbosity
4242
level of logging. So DO NOT USE THIS. */
43-
char *gpr_getenv_silent(const char *name, char** dst);
43+
const char *gpr_getenv_silent(const char *name, char **dst);
4444

4545
#ifdef __cplusplus
4646
}

src/core/lib/support/env_linux.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838

3939
#include "src/core/lib/support/string.h"
4040

41-
char *gpr_getenv_silent(const char *name, char** dst) {
42-
char* insecure_func_used = NULL;
43-
char* result = NULL;
44-
#if defined(GPR_BACKWARDS_COMPATIBILITY_MODE)
41+
const char *gpr_getenv_silent(const char *name, char **dst) {
42+
const char *insecure_func_used = NULL;
43+
char *result = NULL;
44+
#if defined(GPR_BACKWARDS_COMPATIBILITY_MODE)
4545
typedef char *(*getenv_type)(const char *);
4646
static getenv_type getenv_func = NULL;
4747
/* Check to see which getenv variant is supported (go from most
@@ -65,11 +65,10 @@ char *gpr_getenv_silent(const char *name, char** dst) {
6565
}
6666

6767
char *gpr_getenv(const char *name) {
68-
char* result = NULL;
69-
char* insecure_func_used = gpr_getenv_silent(name, &result);
68+
char *result = NULL;
69+
const char *insecure_func_used = gpr_getenv_silent(name, &result);
7070
if (insecure_func_used != NULL) {
71-
gpr_log(GPR_DEBUG,
72-
"Warning: insecure environment read function '%s' used",
71+
gpr_log(GPR_DEBUG, "Warning: insecure environment read function '%s' used",
7372
insecure_func_used);
7473
}
7574
return result;

src/core/lib/support/env_posix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <grpc/support/string_util.h>
3030
#include "src/core/lib/support/string.h"
3131

32-
char *gpr_getenv_silent(const char *name, char **dst) {
32+
const char *gpr_getenv_silent(const char *name, char **dst) {
3333
*dst = gpr_getenv(name);
3434
return NULL;
3535
}

src/core/lib/support/env_windows.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <grpc/support/log.h>
3131
#include <grpc/support/string_util.h>
3232

33-
char *gpr_getenv_silent(const char *name, char **dst) {
33+
const char *gpr_getenv_silent(const char *name, char **dst) {
3434
*dst = gpr_getenv(name);
3535
return NULL;
3636
}

src/core/lib/support/log.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void gpr_set_log_verbosity(gpr_log_severity min_severity_to_print) {
6565

6666
void gpr_log_verbosity_init() {
6767
char *verbosity = NULL;
68-
char *insecure_getenv = gpr_getenv_silent("GRPC_VERBOSITY", &verbosity);
68+
const char *insecure_getenv = gpr_getenv_silent("GRPC_VERBOSITY", &verbosity);
6969

7070
gpr_atm min_severity_to_print = GPR_LOG_SEVERITY_ERROR;
7171
if (verbosity != NULL) {
@@ -84,8 +84,7 @@ void gpr_log_verbosity_init() {
8484
}
8585

8686
if (insecure_getenv != NULL) {
87-
gpr_log(GPR_DEBUG,
88-
"Warning: insecure environment read function '%s' used",
87+
gpr_log(GPR_DEBUG, "Warning: insecure environment read function '%s' used",
8988
insecure_getenv);
9089
}
9190
}

src/cpp/server/server_builder.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() {
250250
has_sync_methods && num_frequently_polled_cqs > 0;
251251

252252
if (has_sync_methods) {
253-
254253
grpc_cq_polling_type polling_type =
255254
is_hybrid_server ? GRPC_CQ_NON_POLLING : GRPC_CQ_DEFAULT_POLLING;
256255

0 commit comments

Comments
 (0)