From dee4a28874f8bf23b3496de6e024eb8a7488a0af Mon Sep 17 00:00:00 2001 From: kichik Date: Sun, 29 Sep 2002 20:50:15 +0000 Subject: [PATCH] cur_userlangstrings removed, no need. git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1215 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/build.cpp | 7 ++----- Source/build.h | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Source/build.cpp b/Source/build.cpp index 90654499..2e225250 100644 --- a/Source/build.cpp +++ b/Source/build.cpp @@ -209,7 +209,6 @@ CEXEBuild::CEXEBuild() cur_datablock=&build_datablock; cur_functions=&build_functions; cur_labels=&build_labels; - cur_userlangstrings=&build_userlangstrings; subsection_open_cnt=0; build_cursection_isfunc=0; @@ -403,7 +402,7 @@ int CEXEBuild::add_string_main(const char *string, int process) // returns offse char *cp = strdup(string+2); strchr(cp, ')')[0] = 0; int idx; - if (cur_userlangstrings->find(cp, 0, &idx) < 0) idx = -1; + if (build_userlangstrings->find(cp, 0, &idx) < 0) idx = -1; free(cp); if (idx >= 0) return -(idx+1); } @@ -422,7 +421,7 @@ int CEXEBuild::add_string_uninst(const char *string, int process) // returns off char *cp = strdup(string+2); strchr(cp, ')')[0] = 0; int idx; - if (cur_userlangstrings->find(cp, 0, &idx) < 0) idx = -1; + if (ubuild_userlangstrings->find(cp, 0, &idx) < 0) idx = -1; free(cp); if (idx >= 0) return -(idx+1); } @@ -1796,7 +1795,6 @@ void CEXEBuild::set_uninstall_mode(int un) cur_entries=&ubuild_entries; cur_functions=&ubuild_functions; cur_labels=&ubuild_labels; - cur_userlangstrings=&ubuild_userlangstrings; } else { @@ -1804,7 +1802,6 @@ void CEXEBuild::set_uninstall_mode(int un) cur_entries=&build_entries; cur_functions=&build_functions; cur_labels=&build_labels; - cur_userlangstrings=&build_userlangstrings; } SWAP(db_opt_save_u,db_opt_save,int); diff --git a/Source/build.h b/Source/build.h index a1b296be..44388956 100644 --- a/Source/build.h +++ b/Source/build.h @@ -198,7 +198,7 @@ class CEXEBuild { GrowBuf build_labels, ubuild_labels, *cur_labels; StringList build_strlist,ubuild_strlist; GrowBuf build_langtables, ubuild_langtables; - StringList build_userlangstrings, ubuild_userlangstrings, *cur_userlangstrings; + StringList build_userlangstrings, ubuild_userlangstrings; MMapBuf build_datablock, ubuild_datablock; // use GrowBuf here instead of MMapBuf if you want IGrowBuf *cur_datablock;