summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qtranslator.cpp
diff options
context:
space:
mode:
authorJoão Abecasis <joao.abecasis@nokia.com>2012-03-27 13:01:28 +0200
committerQt by Nokia <qt-info@nokia.com>2012-03-28 00:44:23 +0200
commit7a0793114b0b261906d8a0b4eaa9cce33b9d610e (patch)
tree2cd14fbb240fbfee32c741e520221d2ef89fe03d /src/corelib/kernel/qtranslator.cpp
parentd5020b89134cbb07e1aefe961168f9b2d9024618 (diff)
There's no need to check pre-validated input
elfHash and friends are used solely from do_translate, which already checks for null strings. There's no need to do it again here. Change-Id: I90a16d2623ca753a444e53952539001988568bdb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qtranslator.cpp')
-rw-r--r--src/corelib/kernel/qtranslator.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 284176dc9b..6120ab24ae 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -106,14 +106,12 @@ static void elfHash_continue(const char *name, uint &h)
const uchar *k;
uint g;
- if (name) {
- k = (const uchar *) name;
- while (*k) {
- h = (h << 4) + *k++;
- if ((g = (h & 0xf0000000)) != 0)
- h ^= g >> 24;
- h &= ~g;
- }
+ k = (const uchar *) name;
+ while (*k) {
+ h = (h << 4) + *k++;
+ if ((g = (h & 0xf0000000)) != 0)
+ h ^= g >> 24;
+ h &= ~g;
}
}