summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2010-04-23 16:15:38 -0700
committerElliott Hughes <enh@google.com>2010-04-23 16:22:02 -0700
commit0808cae1a2616ba9c708c7cc4489723b4060178e (patch)
tree60592ac09b18dcaec2de2b7a1418adae186437d8 /include
parentd5fa369bd73d4098c59b3d9949a67f89910e71f1 (diff)
downloadlibcore-0808cae1a2616ba9c708c7cc4489723b4060178e.zip
libcore-0808cae1a2616ba9c708c7cc4489723b4060178e.tar.gz
libcore-0808cae1a2616ba9c708c7cc4489723b4060178e.tar.bz2
Dead code/cruft removal in the collation code.
I've also renamed ScopedUtfChars::data to ScopedUtfChars::c_str, by analogy with std::string (since this method has always been more like c_str than data). This also fixes a few leaks on error paths. The old code used to go all the way into native code to return a constant hash code of 1, so I've removed all that and switched to the idiomatic bogo hash code (with the idiomatic comment). Change-Id: I25da8c422155860b5ab348786d369c6c7598135c
Diffstat (limited to 'include')
-rw-r--r--include/ScopedUtfChars.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ScopedUtfChars.h b/include/ScopedUtfChars.h
index 8bc3e66..bfe9bb9 100644
--- a/include/ScopedUtfChars.h
+++ b/include/ScopedUtfChars.h
@@ -34,7 +34,7 @@ public:
}
}
- const char* data() const {
+ const char* c_str() const {
return mUtfChars;
}