mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

bpo-32241: Add the const qualifire to declarations of umodifiable strings. (#4748)

Browse source
This commit is contained in:
Serhiy Storchaka 2017-12-12 13:55:04 +02:00 • committed by GitHub
parent 5ce0a2a100
commit 4ae06c5337
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 59 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Modules/main.c
View file

@ -154,10 +154,10 @@ pymain_usage(int error, const wchar_t* program)
}
static char*
static const char*
pymain_get_env_var(const char *name)
{
char *var = Py_GETENV(name);
const char *var = Py_GETENV(name);
if (var && var[0] != '\0') {
return var;
}
@ -170,7 +170,7 @@ pymain_get_env_var(const char *name)
static void
pymain_run_startup(PyCompilerFlags *cf)
{
char *startup = pymain_get_env_var("PYTHONSTARTUP");
const char *startup = pymain_get_env_var("PYTHONSTARTUP");
if (startup == NULL) {
return;
}
@ -542,7 +542,7 @@ error:
static wchar_t*
pymain_wstrdup(_PyMain *pymain, wchar_t *str)
pymain_wstrdup(_PyMain *pymain, const wchar_t *str)
{
wchar_t *str2 = _PyMem_RawWcsdup(str);
if (str2 == NULL) {
@ -554,7 +554,7 @@ pymain_wstrdup(_PyMain *pymain, wchar_t *str)
static int
pymain_optlist_append(_PyMain *pymain, _Py_OptList *list, wchar_t *str)
pymain_optlist_append(_PyMain *pymain, _Py_OptList *list, const wchar_t *str)
{
wchar_t *str2 = pymain_wstrdup(pymain, str);
if (str2 == NULL) {
@ -802,7 +802,7 @@ pymain_warnings_envvar(_PyMain *pymain)
}
#ifdef MS_WINDOWS
wchar_t *wp;
const wchar_t *wp;
if ((wp = _wgetenv(L"PYTHONWARNINGS")) && *wp != L'\0') {
wchar_t *warning, *context = NULL;
@ -824,7 +824,7 @@ pymain_warnings_envvar(_PyMain *pymain)
PyMem_RawFree(buf);
}
#else
char *p = pymain_get_env_var("PYTHONWARNINGS");
const char *p = pymain_get_env_var("PYTHONWARNINGS");
if (p != NULL) {
char *buf, *oldloc;
@ -909,7 +909,7 @@ config_get_program_name(_PyMainInterpreterConfig *config)
assert(config->program_name == NULL);
/* If Py_SetProgramName() was called, use its value */
wchar_t *program_name = _Py_path_config.program_name;
const wchar_t *program_name = _Py_path_config.program_name;
if (program_name != NULL) {
config->program_name = _PyMem_RawWcsdup(program_name);
if (config->program_name == NULL) {
@ -927,7 +927,7 @@ config_get_program_name(_PyMainInterpreterConfig *config)
so the actual executable path is passed in an environment variable.
See Lib/plat-mac/bundlebuiler.py for details about the bootstrap
script. */
char *p = pymain_get_env_var("PYTHONEXECUTABLE");
const char *p = pymain_get_env_var("PYTHONEXECUTABLE");
if (p != NULL) {
size_t len;
wchar_t* program_name = Py_DecodeLocale(p, &len);
@ -939,7 +939,7 @@ config_get_program_name(_PyMainInterpreterConfig *config)
}
#ifdef WITH_NEXT_FRAMEWORK
else {
char* pyvenv_launcher = getenv("__PYVENV_LAUNCHER__");
const char* pyvenv_launcher = getenv("__PYVENV_LAUNCHER__");
if (pyvenv_launcher && *pyvenv_launcher) {
/* Used by Mac/Tools/pythonw.c to forward
* the argv0 of the stub executable
@ -1289,7 +1289,7 @@ pymain_parse_cmdline(_PyMain *pymain)
}
static wchar_t*
static const wchar_t*
pymain_get_xoption(_PyMain *pymain, wchar_t *name)
{
_Py_OptList *list = &pymain->cmdline.xoptions;
@ -1312,11 +1312,11 @@ pymain_get_xoption(_PyMain *pymain, wchar_t *name)
static int
pymain_str_to_int(char *str, int *result)
pymain_str_to_int(const char *str, int *result)
{
errno = 0;
char *endptr = str;
long value = strtol(str, &endptr, 10);
const char *endptr = str;
long value = strtol(str, (char **)&endptr, 10);
if (*endptr != '\0' || errno == ERANGE) {
return -1;
}
@ -1330,11 +1330,11 @@ pymain_str_to_int(char *str, int *result)
static int
pymain_wstr_to_int(wchar_t *wstr, int *result)
pymain_wstr_to_int(const wchar_t *wstr, int *result)
{
errno = 0;
wchar_t *endptr = wstr;
long value = wcstol(wstr, &endptr, 10);
const wchar_t *endptr = wstr;
long value = wcstol(wstr, (wchar_t **)&endptr, 10);
if (*endptr != '\0' || errno == ERANGE) {
return -1;
}
@ -1353,7 +1353,7 @@ pymain_init_tracemalloc(_PyMain *pymain)
int nframe;
int valid;
char *env = pymain_get_env_var("PYTHONTRACEMALLOC");
const char *env = pymain_get_env_var("PYTHONTRACEMALLOC");
if (env) {
if (!pymain_str_to_int(env, &nframe)) {
valid = (nframe >= 1);
@ -1369,9 +1369,9 @@ pymain_init_tracemalloc(_PyMain *pymain)
pymain->core_config.tracemalloc = nframe;
}
wchar_t *xoption = pymain_get_xoption(pymain, L"tracemalloc");
const wchar_t *xoption = pymain_get_xoption(pymain, L"tracemalloc");
if (xoption) {
wchar_t *sep = wcschr(xoption, L'=');
const wchar_t *sep = wcschr(xoption, L'=');
if (sep) {
if (!pymain_wstr_to_int(sep + 1, &nframe)) {
valid = (nframe >= 1);
@ -1398,7 +1398,7 @@ pymain_init_tracemalloc(_PyMain *pymain)
static void
pymain_set_flag_from_env(int *flag, const char *name)
{
char *var = pymain_get_env_var(name);
const char *var = pymain_get_env_var(name);
if (!var) {
return;
}
@ -1449,7 +1449,7 @@ config_get_env_var_dup(wchar_t **dest, wchar_t *wname, char *name)
}
#ifdef MS_WINDOWS
wchar_t *var = _wgetenv(wname);
const wchar_t *var = _wgetenv(wname);
if (!var || var[0] == '\0') {
*dest = NULL;
return 0;
@ -1462,7 +1462,7 @@ config_get_env_var_dup(wchar_t **dest, wchar_t *wname, char *name)
*dest = copy;
#else
char *var = getenv(name);
const char *var = getenv(name);
if (!var || var[0] == '\0') {
*dest = NULL;
return 0;