summaryrefslogtreecommitdiffstats
path: root/khtml/css
diff options
context:
space:
mode:
Diffstat (limited to 'khtml/css')
-rw-r--r--khtml/css/cssproperties.c14
-rw-r--r--khtml/css/cssvalues.c14
-rw-r--r--khtml/css/makeprop2
-rwxr-xr-xkhtml/css/makevalues2
-rw-r--r--khtml/css/parser.cpp16
-rw-r--r--khtml/css/tokenizer.cpp8
6 files changed, 28 insertions, 28 deletions
diff --git a/khtml/css/cssproperties.c b/khtml/css/cssproperties.c
index c86f2d326..486082b41 100644
--- a/khtml/css/cssproperties.c
+++ b/khtml/css/cssproperties.c
@@ -39,7 +39,7 @@ struct props {
int id;
};
-static const struct props * findProp (register const char *str, register unsigned int len);
+static const struct props * findProp (const char *str, unsigned int len);
/* maximum key range = 469, duplicates = 0 */
#ifdef __GNUC__
@@ -50,7 +50,7 @@ inline
#endif
#endif
static unsigned int
-hash_prop (register const char *str, register unsigned int len)
+hash_prop (const char *str, unsigned int len)
{
static const unsigned short asso_values[] =
{
@@ -81,7 +81,7 @@ hash_prop (register const char *str, register unsigned int len)
472, 472, 472, 472, 472, 472, 472, 472, 472, 472,
472, 472, 472, 472, 472, 472
};
- register int hval = len;
+ int hval = len;
switch (hval)
{
@@ -189,7 +189,7 @@ hash_prop (register const char *str, register unsigned int len)
__inline
#endif
const struct props *
-findProp (register const char *str, register unsigned int len)
+findProp (const char *str, unsigned int len)
{
enum
{
@@ -516,15 +516,15 @@ findProp (register const char *str, register unsigned int len)
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
{
- register int key = hash_prop (str, len);
+ int key = hash_prop (str, len);
if (key <= MAX_HASH_VALUE && key >= 0)
{
- register int index = lookup[key];
+ int index = lookup[key];
if (index >= 0)
{
- register const char *s = wordlist_prop[index].name;
+ const char *s = wordlist_prop[index].name;
if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
return &wordlist_prop[index];
diff --git a/khtml/css/cssvalues.c b/khtml/css/cssvalues.c
index 7368d1869..7545cc205 100644
--- a/khtml/css/cssvalues.c
+++ b/khtml/css/cssvalues.c
@@ -39,7 +39,7 @@ struct css_value {
int id;
};
-static const css_value* findValue (register const char *str, register unsigned int len);
+static const css_value* findValue (const char *str, unsigned int len);
/* maximum key range = 2876, duplicates = 0 */
#ifdef __GNUC__
@@ -50,7 +50,7 @@ inline
#endif
#endif
static unsigned int
-hash_val (register const char *str, register unsigned int len)
+hash_val (const char *str, unsigned int len)
{
static const unsigned short asso_values[] =
{
@@ -81,7 +81,7 @@ hash_val (register const char *str, register unsigned int len)
2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
2876, 2876, 2876, 2876, 2876, 2876, 2876
};
- register int hval = 0;
+ int hval = 0;
switch (len)
{
@@ -177,7 +177,7 @@ hash_val (register const char *str, register unsigned int len)
__inline
#endif
const struct css_value *
-findValue (register const char *str, register unsigned int len)
+findValue (const char *str, unsigned int len)
{
enum
{
@@ -1036,15 +1036,15 @@ findValue (register const char *str, register unsigned int len)
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
{
- register int key = hash_val (str, len);
+ int key = hash_val (str, len);
if (key <= MAX_HASH_VALUE && key >= 0)
{
- register int index = lookup[key];
+ int index = lookup[key];
if (index >= 0)
{
- register const char *s = wordlist_value[index].name;
+ const char *s = wordlist_value[index].name;
if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
return &wordlist_value[index];
diff --git a/khtml/css/makeprop b/khtml/css/makeprop
index a1a30ac97..b01ed7319 100644
--- a/khtml/css/makeprop
+++ b/khtml/css/makeprop
@@ -23,7 +23,7 @@
#
grep "^[^\#]" cssproperties.in > cssproperties.strip
-echo -e '%{\n/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssproperties.h"\n%}\nstruct props {\n const char *name;\n int id;\n};\n\nstatic const struct props * findProp (register const char *str, register unsigned int len);\n\n%%' > cssproperties.gperf
+echo -e '%{\n/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssproperties.h"\n%}\nstruct props {\n const char *name;\n int id;\n};\n\nstatic const struct props * findProp (const char *str, unsigned int len);\n\n%%' > cssproperties.gperf
cat cssproperties.strip | awk '{ do { prop = $0; gsub("-", "_"); print prop ", CSS_PROP_" toupper($0) } while (getline) }' >> cssproperties.gperf
echo '%%' >> cssproperties.gperf
echo -e '/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1998 W. Bastian */\n\n#ifndef CSSPROPERTIES_H\n#define CSSPROPERTIES_H\n\nDOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;\n' > cssproperties.h
diff --git a/khtml/css/makevalues b/khtml/css/makevalues
index 0f81f1612..3ca0a82ea 100755
--- a/khtml/css/makevalues
+++ b/khtml/css/makevalues
@@ -24,7 +24,7 @@
#
grep "^[^\#]" cssvalues.in > cssvalues.strip
-echo -e '%{\n/* This file is automatically generated from cssvalues.in by makevalues, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssvalues.h"\n%}\nstruct css_value {\n const char *name;\n int id;\n};\n\nstatic const css_value* findValue (register const char *str, register unsigned int len);\n\n%%' > cssvalues.gperf
+echo -e '%{\n/* This file is automatically generated from cssvalues.in by makevalues, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssvalues.h"\n%}\nstruct css_value {\n const char *name;\n int id;\n};\n\nstatic const css_value* findValue (const char *str, unsigned int len);\n\n%%' > cssvalues.gperf
cat cssvalues.strip | awk '{ do { prop = $0; gsub("-", "_"); print prop ", CSS_VAL_" toupper($0) } while (getline) }' >> cssvalues.gperf
echo '%%' >> cssvalues.gperf
echo -e '/* This file is automatically generated from cssvalues.in by
diff --git a/khtml/css/parser.cpp b/khtml/css/parser.cpp
index c0e6f5869..4d796d232 100644
--- a/khtml/css/parser.cpp
+++ b/khtml/css/parser.cpp
@@ -385,7 +385,7 @@ union yyalloc
# define YYCOPY(To, From, Count) \
do \
{ \
- register YYSIZE_T yyi; \
+ YYSIZE_T yyi; \
for (yyi = 0; yyi < (Count); yyi++) \
(To)[yyi] = (From)[yyi]; \
} \
@@ -1122,7 +1122,7 @@ yystrlen (yystr)
const char *yystr;
# endif
{
- register const char *yys = yystr;
+ const char *yys = yystr;
while (*yys++ != '\0')
continue;
@@ -1147,8 +1147,8 @@ yystpcpy (yydest, yysrc)
const char *yysrc;
# endif
{
- register char *yyd = yydest;
- register const char *yys = yysrc;
+ char *yyd = yydest;
+ const char *yys = yysrc;
while ((*yyd++ = *yys++) != '\0')
continue;
@@ -1338,8 +1338,8 @@ YYSTYPE yylval;
/* Number of syntax errors so far. */
int yynerrs;
- register int yystate;
- register int yyn;
+ int yystate;
+ int yyn;
int yyresult;
/* Number of tokens to shift before error messages enabled. */
int yyerrstatus;
@@ -1357,12 +1357,12 @@ int yynerrs;
/* The state stack. */
short int yyssa[YYINITDEPTH];
short int *yyss = yyssa;
- register short int *yyssp;
+ short int *yyssp;
/* The semantic value stack. */
YYSTYPE yyvsa[YYINITDEPTH];
YYSTYPE *yyvs = yyvsa;
- register YYSTYPE *yyvsp;
+ YYSTYPE *yyvsp;
diff --git a/khtml/css/tokenizer.cpp b/khtml/css/tokenizer.cpp
index 493a98032..e2ffd36ea 100644
--- a/khtml/css/tokenizer.cpp
+++ b/khtml/css/tokenizer.cpp
@@ -592,9 +592,9 @@ static yyconst short int yy_chk[1695] =
YY_DECL
{
- register yy_state_type yy_current_state;
- register unsigned short *yy_cp, *yy_bp;
- register int yy_act;
+ yy_state_type yy_current_state;
+ unsigned short *yy_cp, *yy_bp;
+ int yy_act;
#line 25 "tokenizer.flex"
@@ -617,7 +617,7 @@ YY_DECL
yy_match:
do
{
- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+ YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
if ( yy_accept[yy_current_state] )
{
yy_last_accepting_state = yy_current_state;