kdecore: regenerate entities source file

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-06-15 04:35:52 +03:00
parent a0ff14b7ae
commit 68af32dbe4

View file

@ -1,4 +1,4 @@
/* C++ code produced by gperf version 3.0.4 */ /* C++ code produced by gperf version 3.1 */
/* Command-line: gperf -a -o -t -k '*' -D -Wwordlist_Entity -s 2 kentities.gperf */ /* Command-line: gperf -a -o -t -k '*' -D -Wwordlist_Entity -s 2 kentities.gperf */
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@ -25,11 +25,9 @@
&& ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
&& ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
/* The character set is not based on ISO-646. */ /* The character set is not based on ISO-646. */
#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>." #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
#endif #endif
#include <string.h>
#line 1 "kentities.gperf" #line 1 "kentities.gperf"
/* This file is part of the KDE libraries /* This file is part of the KDE libraries
@ -68,13 +66,13 @@ struct entity {
class EntitiesHash class EntitiesHash
{ {
private: private:
static inline unsigned int hash_Entity (const char *str, unsigned int len); static inline unsigned int hash_Entity (const char *str, size_t len);
public: public:
static const struct entity *kde_findEntity (const char *str, unsigned int len); static const struct entity *kde_findEntity (const char *str, size_t len);
}; };
inline unsigned int inline unsigned int
EntitiesHash::hash_Entity (const char *str, unsigned int len) EntitiesHash::hash_Entity (const char *str, size_t len)
{ {
static const unsigned short asso_values[] = static const unsigned short asso_values[] =
{ {
@ -105,40 +103,40 @@ EntitiesHash::hash_Entity (const char *str, unsigned int len)
1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
1142, 1142, 1142, 1142, 1142, 1142, 1142 1142, 1142, 1142, 1142, 1142, 1142, 1142
}; };
int hval = len; unsigned int hval = len;
switch (hval) switch (hval)
{ {
default: default:
hval += asso_values[(unsigned char)str[7]]; hval += asso_values[static_cast<unsigned char>(str[7])];
/*FALLTHROUGH*/ /*FALLTHROUGH*/
case 7: case 7:
hval += asso_values[(unsigned char)str[6]]; hval += asso_values[static_cast<unsigned char>(str[6])];
/*FALLTHROUGH*/ /*FALLTHROUGH*/
case 6: case 6:
hval += asso_values[(unsigned char)str[5]]; hval += asso_values[static_cast<unsigned char>(str[5])];
/*FALLTHROUGH*/ /*FALLTHROUGH*/
case 5: case 5:
hval += asso_values[(unsigned char)str[4]]; hval += asso_values[static_cast<unsigned char>(str[4])];
/*FALLTHROUGH*/ /*FALLTHROUGH*/
case 4: case 4:
hval += asso_values[(unsigned char)str[3]]; hval += asso_values[static_cast<unsigned char>(str[3])];
/*FALLTHROUGH*/ /*FALLTHROUGH*/
case 3: case 3:
hval += asso_values[(unsigned char)str[2]]; hval += asso_values[static_cast<unsigned char>(str[2])];
/*FALLTHROUGH*/ /*FALLTHROUGH*/
case 2: case 2:
hval += asso_values[(unsigned char)str[1]+1]; hval += asso_values[static_cast<unsigned char>(str[1]+1)];
/*FALLTHROUGH*/ /*FALLTHROUGH*/
case 1: case 1:
hval += asso_values[(unsigned char)str[0]]; hval += asso_values[static_cast<unsigned char>(str[0])];
break; break;
} }
return hval; return hval;
} }
const struct entity * const struct entity *
EntitiesHash::kde_findEntity (const char *str, unsigned int len) EntitiesHash::kde_findEntity (const char *str, size_t len)
{ {
enum enum
{ {
@ -836,9 +834,9 @@ EntitiesHash::kde_findEntity (const char *str, unsigned int len)
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
{ {
int key = hash_Entity (str, len); unsigned int key = hash_Entity (str, len);
if (key <= MAX_HASH_VALUE && key >= 0) if (key <= MAX_HASH_VALUE)
{ {
int index = lookup[key]; int index = lookup[key];