From 30606e55f1a570463d837cb110b0bd4adba6643b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 20 Feb 2020 11:22:30 +0900 Subject: [PATCH] Remove remaining 'register' instructions. Signed-off-by: Michele Calgaro --- dcop/KDE-ICE/iceauth.c | 4 ++-- tdecore/kentities.c | 4 ++-- tdecore/kmdcodec.cpp | 2 +- tdehtml/css/cssproperties.c | 6 +++--- tdehtml/css/cssvalues.c | 6 +++--- tdehtml/css/makeprop | 2 +- tdehtml/css/makevalues | 2 +- tdehtml/html/doctypes.cpp | 4 ++-- tdehtml/misc/htmlattrs.c | 4 ++-- tdehtml/misc/htmltags.c | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dcop/KDE-ICE/iceauth.c b/dcop/KDE-ICE/iceauth.c index 74db91367..609615643 100644 --- a/dcop/KDE-ICE/iceauth.c +++ b/dcop/KDE-ICE/iceauth.c @@ -45,7 +45,7 @@ extern Time_t time (); #define Time_t time_t #endif -static int binaryEqual (register const char *a, const char *b, unsigned len); +static int binaryEqual (const char *a, const char *b, unsigned len); static int was_called_state; @@ -264,7 +264,7 @@ char **errorStringRet; * local routines */ -static int binaryEqual (register const char *a, const char *b, unsigned len) +static int binaryEqual (const char *a, const char *b, unsigned len) { while (len--) if (*a++ != *b++) diff --git a/tdecore/kentities.c b/tdecore/kentities.c index 070ee7689..8610b49e7 100644 --- a/tdecore/kentities.c +++ b/tdecore/kentities.c @@ -73,7 +73,7 @@ inline #endif #endif static unsigned int -hash_Entity (register const char *str, unsigned int len) +hash_Entity (const char *str, unsigned int len) { static const unsigned short asso_values[] = { @@ -140,7 +140,7 @@ hash_Entity (register const char *str, unsigned int len) __inline #endif const struct entity * -kde_findEntity (register const char *str, unsigned int len) +kde_findEntity (const char *str, unsigned int len) { enum { diff --git a/tdecore/kmdcodec.cpp b/tdecore/kmdcodec.cpp index 9b74c53b0..b5d540f53 100644 --- a/tdecore/kmdcodec.cpp +++ b/tdecore/kmdcodec.cpp @@ -137,7 +137,7 @@ const unsigned int KCodecs::maxQPLineLength = 70; /******************************** KCodecs ********************************/ // strchr(3) for broken systems. -static int rikFindChar(register const char * _s, const char c) +static int rikFindChar(const char * _s, const char c) { const char * s = _s; diff --git a/tdehtml/css/cssproperties.c b/tdehtml/css/cssproperties.c index 1f4ba882b..3e6341ab7 100644 --- a/tdehtml/css/cssproperties.c +++ b/tdehtml/css/cssproperties.c @@ -39,7 +39,7 @@ struct props { int id; }; -static const struct props * findProp (register const char *str, 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, unsigned int len) +hash_prop (const char *str, unsigned int len) { static const unsigned short asso_values[] = { @@ -189,7 +189,7 @@ hash_prop (register const char *str, unsigned int len) __inline #endif const struct props * -findProp (register const char *str, unsigned int len) +findProp (const char *str, unsigned int len) { enum { diff --git a/tdehtml/css/cssvalues.c b/tdehtml/css/cssvalues.c index 9114aa513..af175349e 100644 --- a/tdehtml/css/cssvalues.c +++ b/tdehtml/css/cssvalues.c @@ -39,7 +39,7 @@ struct css_value { int id; }; -static const css_value* findValue (register const char *str, 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, unsigned int len) +hash_val (const char *str, unsigned int len) { static const unsigned short asso_values[] = { @@ -177,7 +177,7 @@ hash_val (register const char *str, unsigned int len) __inline #endif const struct css_value * -findValue (register const char *str, unsigned int len) +findValue (const char *str, unsigned int len) { enum { diff --git a/tdehtml/css/makeprop b/tdehtml/css/makeprop index a23f0b54f..b01ed7319 100644 --- a/tdehtml/css/makeprop +++ b/tdehtml/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, 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/tdehtml/css/makevalues b/tdehtml/css/makevalues index eb496a563..3ca0a82ea 100755 --- a/tdehtml/css/makevalues +++ b/tdehtml/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, 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/tdehtml/html/doctypes.cpp b/tdehtml/html/doctypes.cpp index 4c456dc71..adbefab87 100644 --- a/tdehtml/html/doctypes.cpp +++ b/tdehtml/html/doctypes.cpp @@ -51,7 +51,7 @@ inline #endif #endif static unsigned int -hash (register const char *str, unsigned int len) +hash (const char *str, unsigned int len) { static const unsigned short asso_values[] = { @@ -334,7 +334,7 @@ hash (register const char *str, unsigned int len) __inline #endif const struct PubIDInfo * -findDoctypeEntry (register const char *str, unsigned int len) +findDoctypeEntry (const char *str, unsigned int len) { enum { diff --git a/tdehtml/misc/htmlattrs.c b/tdehtml/misc/htmlattrs.c index 9bee3309a..e37f4c5c9 100644 --- a/tdehtml/misc/htmlattrs.c +++ b/tdehtml/misc/htmlattrs.c @@ -57,7 +57,7 @@ inline #endif #endif static unsigned int -hash_attr (register const char *str, unsigned int len) +hash_attr (const char *str, unsigned int len) { static const unsigned short asso_values[] = { @@ -831,7 +831,7 @@ inline #endif #endif const struct attrs * -findAttr (register const char *str, unsigned int len) +findAttr (const char *str, unsigned int len) { if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) { diff --git a/tdehtml/misc/htmltags.c b/tdehtml/misc/htmltags.c index be6fade5f..fa701fe69 100644 --- a/tdehtml/misc/htmltags.c +++ b/tdehtml/misc/htmltags.c @@ -48,7 +48,7 @@ inline #endif #endif static unsigned int -hash_tag (register const char *str, unsigned int len) +hash_tag (const char *str, unsigned int len) { static const unsigned short asso_values[] = { @@ -338,7 +338,7 @@ static const struct spool_Tag_t spool_Tag_contents = __inline #endif const struct tags * -findTag (register const char *str, unsigned int len) +findTag (const char *str, unsigned int len) { enum {