summaryrefslogtreecommitdiffstats
path: root/kexi
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2020-01-30 20:17:52 +0900
committerMichele Calgaro <[email protected]>2020-01-30 20:17:52 +0900
commite5dc5b5be9900b9c8b2d7988216d56156c806b20 (patch)
treed0209902442729f7856d2a8efdca565373fb5c43 /kexi
parent9d008f46e1b540304fdb7fb0270e23b7c3f43a68 (diff)
downloadkoffice-e5dc5b5be9900b9c8b2d7988216d56156c806b20.tar.gz
koffice-e5dc5b5be9900b9c8b2d7988216d56156c806b20.zip
Removed explicit usage of the 'register' keyword.
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'kexi')
-rw-r--r--kexi/3rdparty/kexisql/src/printf.c8
-rw-r--r--kexi/3rdparty/kexisql/src/util.c8
-rw-r--r--kexi/3rdparty/kexisql3/src/func.c2
-rw-r--r--kexi/3rdparty/kexisql3/src/md5.c2
-rw-r--r--kexi/3rdparty/kexisql3/src/printf.c8
-rw-r--r--kexi/3rdparty/kexisql3/src/util.c4
-rw-r--r--kexi/kexidb/parser/sqlscanner.cpp42
7 files changed, 37 insertions, 37 deletions
diff --git a/kexi/3rdparty/kexisql/src/printf.c b/kexi/3rdparty/kexisql/src/printf.c
index f867d62a..a5445f60 100644
--- a/kexi/3rdparty/kexisql/src/printf.c
+++ b/kexi/3rdparty/kexisql/src/printf.c
@@ -361,8 +361,8 @@ static int vxprintf(
}
bufpt = &buf[etBUFSIZE-1];
{
- register char *cset; /* Use registers for speed */
- register int base;
+ char *cset; /* Use registers for speed */
+ int base;
cset = infop->charset;
base = infop->base;
do{ /* Convert to ascii */
@@ -603,7 +603,7 @@ static int vxprintf(
** the output.
*/
if( !flag_leftjustify ){
- register int nspace;
+ int nspace;
nspace = width-length;
if( nspace>0 ){
count += nspace;
@@ -619,7 +619,7 @@ static int vxprintf(
count += length;
}
if( flag_leftjustify ){
- register int nspace;
+ int nspace;
nspace = width-length;
if( nspace>0 ){
count += nspace;
diff --git a/kexi/3rdparty/kexisql/src/util.c b/kexi/3rdparty/kexisql/src/util.c
index 09a13c7b..710a0781 100644
--- a/kexi/3rdparty/kexisql/src/util.c
+++ b/kexi/3rdparty/kexisql/src/util.c
@@ -500,14 +500,14 @@ int sqliteHashNoCase(const char *z, int n){
** there is no consistency, we will define our own.
*/
int sqliteStrICmp(const char *zLeft, const char *zRight){
- register unsigned char *a, *b;
+ unsigned char *a, *b;
a = (unsigned char *)zLeft;
b = (unsigned char *)zRight;
while( *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
return UpperToLower[*a] - UpperToLower[*b];
}
int sqliteStrNICmp(const char *zLeft, const char *zRight, int N){
- register unsigned char *a, *b;
+ unsigned char *a, *b;
a = (unsigned char *)zLeft;
b = (unsigned char *)zRight;
while( N-- > 0 && *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
@@ -941,7 +941,7 @@ static int sqlite_utf8_to_int(const unsigned char *z){
*/
int
sqliteGlobCompare(const unsigned char *zPattern, const unsigned char *zString){
- register int c;
+ int c;
int invert;
int seen;
int c2;
@@ -1030,7 +1030,7 @@ sqliteGlobCompare(const unsigned char *zPattern, const unsigned char *zString){
*/
int
sqliteLikeCompare(const unsigned char *zPattern, const unsigned char *zString){
- register int c;
+ int c;
int c2;
while( (c = UpperToLower[*zPattern])!=0 ){
diff --git a/kexi/3rdparty/kexisql3/src/func.c b/kexi/3rdparty/kexisql3/src/func.c
index 9917f4e2..3f78c59d 100644
--- a/kexi/3rdparty/kexisql3/src/func.c
+++ b/kexi/3rdparty/kexisql3/src/func.c
@@ -363,7 +363,7 @@ static int patternCompare(
const struct compareInfo *pInfo, /* Information about how to do the compare */
const int esc /* The escape character */
){
- register int c;
+ int c;
int invert;
int seen;
int c2;
diff --git a/kexi/3rdparty/kexisql3/src/md5.c b/kexi/3rdparty/kexisql3/src/md5.c
index 32fcb6b6..a527b256 100644
--- a/kexi/3rdparty/kexisql3/src/md5.c
+++ b/kexi/3rdparty/kexisql3/src/md5.c
@@ -81,7 +81,7 @@ static void byteReverse (unsigned char *buf, unsigned longs){
* the data and converts bytes into longwords for this routine.
*/
static void MD5Transform(uint32 buf[4], const uint32 in[16]){
- register uint32 a, b, c, d;
+ uint32 a, b, c, d;
a = buf[0];
b = buf[1];
diff --git a/kexi/3rdparty/kexisql3/src/printf.c b/kexi/3rdparty/kexisql3/src/printf.c
index a669eb8d..a980e79c 100644
--- a/kexi/3rdparty/kexisql3/src/printf.c
+++ b/kexi/3rdparty/kexisql3/src/printf.c
@@ -397,8 +397,8 @@ static int vxprintf(
}
bufpt = &buf[etBUFSIZE-1];
{
- register const char *cset; /* Use registers for speed */
- register int base;
+ const char *cset; /* Use registers for speed */
+ int base;
cset = &aDigits[infop->charset];
base = infop->base;
do{ /* Convert to ascii */
@@ -659,7 +659,7 @@ static int vxprintf(
** the output.
*/
if( !flag_leftjustify ){
- register int nspace;
+ int nspace;
nspace = width-length;
if( nspace>0 ){
count += nspace;
@@ -675,7 +675,7 @@ static int vxprintf(
count += length;
}
if( flag_leftjustify ){
- register int nspace;
+ int nspace;
nspace = width-length;
if( nspace>0 ){
count += nspace;
diff --git a/kexi/3rdparty/kexisql3/src/util.c b/kexi/3rdparty/kexisql3/src/util.c
index 0bbcb019..dd01a1c7 100644
--- a/kexi/3rdparty/kexisql3/src/util.c
+++ b/kexi/3rdparty/kexisql3/src/util.c
@@ -545,14 +545,14 @@ const unsigned char sqlite3UpperToLower[] = {
** there is no consistency, we will define our own.
*/
int sqlite3StrICmp(const char *zLeft, const char *zRight){
- register unsigned char *a, *b;
+ unsigned char *a, *b;
a = (unsigned char *)zLeft;
b = (unsigned char *)zRight;
while( *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
return UpperToLower[*a] - UpperToLower[*b];
}
int sqlite3StrNICmp(const char *zLeft, const char *zRight, int N){
- register unsigned char *a, *b;
+ unsigned char *a, *b;
a = (unsigned char *)zLeft;
b = (unsigned char *)zRight;
while( N-- > 0 && *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
diff --git a/kexi/kexidb/parser/sqlscanner.cpp b/kexi/kexidb/parser/sqlscanner.cpp
index 3cd6bdf3..f653a6eb 100644
--- a/kexi/kexidb/parser/sqlscanner.cpp
+++ b/kexi/kexidb/parser/sqlscanner.cpp
@@ -678,9 +678,9 @@ YY_MALLOC_DECL
YY_DECL
{
- register yy_state_type yy_current_state;
- register char *yy_cp, *yy_bp;
- register int yy_act;
+ yy_state_type yy_current_state;
+ char *yy_cp, *yy_bp;
+ int yy_act;
#line 58 "sqlscanner.l"
@@ -728,7 +728,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;
@@ -1293,9 +1293,9 @@ case YY_STATE_EOF(INITIAL):
static int yy_get_next_buffer()
{
- register char *dest = yy_current_buffer->yy_ch_buf;
- register char *source = yytext_ptr;
- register int number_to_move, i;
+ char *dest = yy_current_buffer->yy_ch_buf;
+ char *source = yytext_ptr;
+ int number_to_move, i;
int ret_val;
if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
@@ -1425,14 +1425,14 @@ static int yy_get_next_buffer()
static yy_state_type yy_get_previous_state()
{
- register yy_state_type yy_current_state;
- register char *yy_cp;
+ yy_state_type yy_current_state;
+ char *yy_cp;
yy_current_state = yy_start;
for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
{
- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
if ( yy_accept[yy_current_state] )
{
yy_last_accepting_state = yy_current_state;
@@ -1464,10 +1464,10 @@ static yy_state_type yy_try_NUL_trans( yy_current_state )
yy_state_type yy_current_state;
#endif
{
- register int yy_is_jam;
- register char *yy_cp = yy_c_buf_p;
+ int yy_is_jam;
+ char *yy_cp = yy_c_buf_p;
- register YY_CHAR yy_c = 1;
+ YY_CHAR yy_c = 1;
if ( yy_accept[yy_current_state] )
{
yy_last_accepting_state = yy_current_state;
@@ -1488,14 +1488,14 @@ yy_state_type yy_current_state;
#ifndef YY_NO_UNPUT
#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
+static void yyunput( int c, char *yy_bp )
#else
static void yyunput( c, yy_bp )
int c;
-register char *yy_bp;
+char *yy_bp;
#endif
{
- register char *yy_cp = yy_c_buf_p;
+ char *yy_cp = yy_c_buf_p;
/* undo effects of setting up yytext */
*yy_cp = yy_hold_char;
@@ -1503,10 +1503,10 @@ register char *yy_bp;
if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
{ /* need to shift things up to make room */
/* +2 for EOB chars. */
- register int number_to_move = yy_n_chars + 2;
- register char *dest = &yy_current_buffer->yy_ch_buf[
+ int number_to_move = yy_n_chars + 2;
+ char *dest = &yy_current_buffer->yy_ch_buf[
yy_current_buffer->yy_buf_size + 2];
- register char *source =
+ char *source =
&yy_current_buffer->yy_ch_buf[number_to_move];
while ( source > yy_current_buffer->yy_ch_buf )
@@ -1971,7 +1971,7 @@ yyconst char *s2;
int n;
#endif
{
- register int i;
+ int i;
for ( i = 0; i < n; ++i )
s1[i] = s2[i];
}
@@ -1985,7 +1985,7 @@ static int yy_flex_strlen( s )
yyconst char *s;
#endif
{
- register int n;
+ int n;
for ( n = 0; s[n]; ++n )
;