From 27cd387b7c3e45685db2f0dae4e9188f562cb7f0 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Sat, 26 Oct 2013 15:37:15 +0800 Subject: [PATCH] Constify 'la_name' in struct language_defn Hi, When I add another name of language, I find field 'la_name' can be 'const char *'. This patch is to constify it. gdb: 2013-11-07 Yao Qi * language.c (language_str): Return const char *. (add_language): Add const to 'language_names' * language.h (struct language_defn) : Add const. (language_str: Update declaration. --- gdb/ChangeLog | 7 +++++++ gdb/language.c | 4 ++-- gdb/language.h | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a282b82bb21..fee6b06c1be 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2013-11-07 Yao Qi + + * language.c (language_str): Return const char *. + (add_language): Add const to 'language_names' + * language.h (struct language_defn) : Add const. + (language_str: Update declaration. + 2013-11-06 Andreas Arnez * s390-linux-nat.c (s390_read_description): Consider the TE field diff --git a/gdb/language.c b/gdb/language.c index dcad5f389b4..aa708b983a5 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -485,7 +485,7 @@ language_def (enum language lang) } /* Return the language as a string. */ -char * +const char * language_str (enum language lang) { int i; @@ -520,7 +520,7 @@ void add_language (const struct language_defn *lang) { /* For the "set language" command. */ - static char **language_names = NULL; + static const char **language_names = NULL; /* For the "help set language" command. */ char *language_set_doc = NULL; diff --git a/gdb/language.h b/gdb/language.h index 5e029ea00ba..14aedb615d3 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -132,7 +132,7 @@ struct language_defn { /* Name of the language. */ - char *la_name; + const char *la_name; /* its symtab language-enum (defs.h). */ @@ -488,7 +488,7 @@ extern enum language language_enum (char *str); extern const struct language_defn *language_def (enum language); -extern char *language_str (enum language); +extern const char *language_str (enum language); /* Add a language to the set known by GDB (at initialization time). */ -- 2.30.2