diff options
| author | Matthias Melcher <github@matthiasm.com> | 2022-12-22 00:18:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-22 00:18:01 +0100 |
| commit | d98c6638938b09934889b5c639a56d4dea10a6fb (patch) | |
| tree | 58bd129f6e21535a483e995ac3325264c8ec1347 /fluid | |
| parent | 1d212b7a0394fb72e76b3e713e2aa949cea4d612 (diff) | |
Fix compilation on old gcc (#606)
* Fixing char* use in FLUID
* Fixing const cast
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/code.cxx | 2 | ||||
| -rw-r--r-- | fluid/fluid.cxx | 13 | ||||
| -rw-r--r-- | fluid/fluid.h | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/fluid/code.cxx b/fluid/code.cxx index 52625b8e7..5cc02a241 100644 --- a/fluid/code.cxx +++ b/fluid/code.cxx @@ -612,7 +612,7 @@ int write_code(const char *s, const char *t) { write_c("// Initialize I18N stuff now for menus...\n"); write_c("#%sinclude <locale.h>\n", indent()); write_c("static char *_locale = setlocale(LC_MESSAGES, \"\");\n"); - write_c("static nl_catd _catalog = catopen(\"%s\", 0);\n", P.i18n_program); + write_c("static nl_catd _catalog = catopen(\"%s\", 0);\n", P.i18n_program.value()); } } if (conditional) { diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index 8aaf8f6b1..38a74dec1 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -254,7 +254,6 @@ Project P; Project::Project() : i18n_type(0), - i18n_program(""), include_H_from_C(1), use_FL_COMMAND(0), utf8_in_src(0), @@ -277,7 +276,7 @@ void Project::reset() { i18n_static_function = ""; i18n_file = ""; i18n_set = ""; - i18n_program[0] = 0; + i18n_program = ""; include_H_from_C = 1; use_FL_COMMAND = 0; utf8_in_src = 0; @@ -998,8 +997,9 @@ int write_code_files() { } char cname[FL_PATH_MAX+1]; char hname[FL_PATH_MAX+1]; - strlcpy(P.i18n_program, fl_filename_name(filename), FL_PATH_MAX); - fl_filename_setext(P.i18n_program, FL_PATH_MAX, ""); + P.i18n_program = fl_filename_name(filename); + P.i18n_program.capacity(FL_PATH_MAX); + fl_filename_setext(P.i18n_program.buffer(), FL_PATH_MAX, ""); if (P.code_file_name[0] == '.' && strchr(P.code_file_name, '/') == NULL) { strlcpy(cname, fl_filename_name(filename), FL_PATH_MAX); fl_filename_setext(cname, FL_PATH_MAX, P.code_file_name); @@ -1878,8 +1878,9 @@ void update_sourceview_cb(Fl_Button*, void*) sv_strings->buffer()->loadfile(fn); sv_strings->scroll(top, 0); } else if (sv_source->visible_r() || sv_header->visible_r()) { - strlcpy(P.i18n_program, fl_filename_name(sv_source_filename), FL_PATH_MAX); - fl_filename_setext(P.i18n_program, FL_PATH_MAX, ""); + P.i18n_program = fl_filename_name(sv_source_filename); + P.i18n_program.capacity(FL_PATH_MAX); + fl_filename_setext(P.i18n_program.buffer(), FL_PATH_MAX, ""); Fd_String code_file_name_bak = P.code_file_name; P.code_file_name = sv_source_filename; Fd_String header_file_name_bak = P.header_file_name; diff --git a/fluid/fluid.h b/fluid/fluid.h index 98ed1886d..52ba75ba2 100644 --- a/fluid/fluid.h +++ b/fluid/fluid.h @@ -105,7 +105,7 @@ public: Fd_String i18n_static_function; Fd_String i18n_file; Fd_String i18n_set; - char i18n_program[FL_PATH_MAX+1]; + Fd_String i18n_program; int include_H_from_C; int use_FL_COMMAND; int utf8_in_src; |