aboutsummaryrefslogtreecommitdiffhomepage
path: root/lexlib
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2020-03-27 09:16:06 +1100
committerNeil <nyamatongwe@gmail.com>2020-03-27 09:16:06 +1100
commit65c3b110e48a73b4bc6fe2cb1f37d2415c0aa3d2 (patch)
treed5d952a94347de3a06692f0c955161256b0e4beb /lexlib
parent5f4a3252dfb66b77f6ed4acf0e4bc46a5c678744 (diff)
downloadscintilla-mirror-65c3b110e48a73b4bc6fe2cb1f37d2415c0aa3d2.tar.gz
Backport: Avoid casts by returning size_t from GetExpanded.
Backport of changeset 8099:2228fb724ce7.
Diffstat (limited to 'lexlib')
-rw-r--r--lexlib/PropSetSimple.cxx4
-rw-r--r--lexlib/PropSetSimple.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/lexlib/PropSetSimple.cxx b/lexlib/PropSetSimple.cxx
index 5ce353c71..6e1312527 100644
--- a/lexlib/PropSetSimple.cxx
+++ b/lexlib/PropSetSimple.cxx
@@ -137,10 +137,10 @@ static int ExpandAllInPlace(const PropSetSimple &props, std::string &withVars, i
return maxExpands;
}
-int PropSetSimple::GetExpanded(const char *key, char *result) const {
+size_t PropSetSimple::GetExpanded(const char *key, char *result) const {
std::string val = Get(key);
ExpandAllInPlace(*this, val, 100, VarChain(key));
- const int n = static_cast<int>(val.size());
+ const size_t n = val.size();
if (result) {
memcpy(result, val.c_str(), n+1);
}
diff --git a/lexlib/PropSetSimple.h b/lexlib/PropSetSimple.h
index ba4e42446..d4a5b2243 100644
--- a/lexlib/PropSetSimple.h
+++ b/lexlib/PropSetSimple.h
@@ -19,7 +19,7 @@ public:
void Set(const char *key, const char *val, size_t lenKey, size_t lenVal);
void SetMultiple(const char *);
const char *Get(const char *key) const;
- int GetExpanded(const char *key, char *result) const;
+ size_t GetExpanded(const char *key, char *result) const;
int GetInt(const char *key, int defaultValue=0) const;
};