Removed explicit usage of the 'register' keyword.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/10/head
Michele Calgaro 4 years ago
parent 9d008f46e1
commit e5dc5b5be9
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -315,7 +315,7 @@ typedef struct {
} BCHSWADJUSTS, *LPBCHSWADJUSTS;
static int desaturateSampler(register WORD In[], register WORD Out[], register LPVOID /*Cargo*/)
static int desaturateSampler(WORD In[], WORD Out[], LPVOID /*Cargo*/)
{
cmsCIELab LabIn, LabOut;
cmsCIELCh LChIn, LChOut;

@ -571,8 +571,8 @@ bump_map()
{
POINT p;
CELL_PTR cell;
register int x, y;
register int colour;
int x, y;
int colour;
for (x=0; x < CANVAS_WIDTH; x++) {

@ -218,8 +218,8 @@ bump_map()
{
POINT p;
CELL_PTR cell;
register int x, y;
register int colour;
int x, y;
int colour;
for (y=0; y < CANVAS_HEIGHT; y++) {

@ -627,8 +627,8 @@ bump_map()
{
POINT p;
CELL_PTR cell;
register int x, y;
register int colour;
int x, y;
int colour;
for (y=0; y < CANVAS_HEIGHT; y++) {

@ -3047,19 +3047,19 @@ namespace cimg_library {
case 1: break;
case 2: {
for (unsigned short *ptr = (unsigned short*)buffer+size; ptr>(unsigned short*)buffer;) {
const register unsigned short val = *(--ptr);
const unsigned short val = *(--ptr);
*ptr = (val>>8)|((val<<8));
}
} break;
case 4: {
for (unsigned int *ptr = (unsigned int*)buffer+size; ptr>(unsigned int*)buffer;) {
const register unsigned int val = *(--ptr);
const unsigned int val = *(--ptr);
*ptr = (val>>24)|((val>>8)&0xff00)|((val<<8)&0xff0000)|(val<<24);
}
} break;
default: {
for (T* ptr = buffer+size; ptr>buffer; --ptr) {
register unsigned char *pb=(unsigned char*)(--ptr), *pe=pb+sizeof(T);
unsigned char *pb=(unsigned char*)(--ptr), *pe=pb+sizeof(T);
for (int i=0; i<(int)sizeof(T)/2; i++) cimg::swap(*(pb++),*(--pe));
} break;
}

@ -35,13 +35,13 @@ void TIFFStreamContigBase::moveToLine(uint32 lineNumber)
uint32 TIFFStreamContigBelow16::nextValue()
{
register uint8 remain;
register uint32 value;
uint8 remain;
uint32 value;
remain = m_depth;
value = 0;
while (remain > 0)
{
register uint8 toread;
uint8 toread;
toread = remain;
if (toread > m_posinc) toread = m_posinc;
remain -= toread;
@ -58,13 +58,13 @@ uint32 TIFFStreamContigBelow16::nextValue()
uint32 TIFFStreamContigBelow32::nextValue()
{
register uint8 remain;
register uint32 value;
uint8 remain;
uint32 value;
remain = m_depth;
value = 0;
while (remain > 0)
{
register uint8 toread;
uint8 toread;
toread = remain;
if (toread > m_posinc) toread = m_posinc;
remain -= toread;
@ -81,13 +81,13 @@ uint32 TIFFStreamContigBelow32::nextValue()
uint32 TIFFStreamContigAbove32::nextValue()
{
register uint8 remain;
register uint32 value;
uint8 remain;
uint32 value;
remain = m_depth;
value = 0;
while (remain > 0)
{
register uint8 toread;
uint8 toread;
toread = remain;
if (toread > m_posinc) toread = m_posinc;
remain -= toread;

@ -58,8 +58,8 @@ static inline unsigned long readU32( const void* p )
typedef double& data_64;
inline void convert_64 (data_64 convert)
{
register unsigned char temp;
register unsigned int u_int_temp;
unsigned char temp;
unsigned int u_int_temp;
temp = ((unsigned char*)&convert)[0];
((unsigned char*)&convert)[0] = ((unsigned char*)&convert)[3];
((unsigned char*)&convert)[3] = temp;

@ -125,7 +125,7 @@ rgb1 (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *colorm
int width, height;
int bpl;
unsigned char *s;
register unsigned char data;
unsigned char data;
unsigned char *o;
unsigned char *srow = image->data, *orow = pixels;
@ -164,7 +164,7 @@ rgb1a (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *color
int width, height;
int bpl;
unsigned char *s;
register unsigned char data;
unsigned char data;
unsigned char *o;
unsigned char *srow = image->data, *orow = pixels;
unsigned int remap[2];
@ -216,10 +216,10 @@ rgb8 (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *colorm
int width, height;
int bpl;
unsigned int mask;
register unsigned int data;
unsigned int data;
unsigned char *srow = image->data, *orow = pixels;
register unsigned char *s;
register unsigned char *o;
unsigned char *s;
unsigned char *o;
width = image->width;
height = image->height;
@ -254,10 +254,10 @@ rgb8a (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *color
int width, height;
int bpl;
unsigned int mask;
register unsigned int data;
unsigned int data;
unsigned int remap[256];
register unsigned char *s; /* read 2 pixels at once */
register unsigned int *o;
unsigned char *s; /* read 2 pixels at once */
unsigned int *o;
unsigned char *srow = image->data, *orow = pixels;
width = image->width;
@ -307,11 +307,11 @@ rgb565lsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
int bpl;
#ifdef LITTLE
register unsigned int *s; /* read 2 pixels at once */
unsigned int *s; /* read 2 pixels at once */
#else
register unsigned char *s; /* read 2 pixels at once */
unsigned char *s; /* read 2 pixels at once */
#endif
register unsigned short *o;
unsigned short *o;
unsigned char *srow = image->data, *orow = pixels;
width = image->width;
@ -326,7 +326,7 @@ rgb565lsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
#endif
o = (unsigned short *) orow;
for (xx = 1; xx < width; xx += 2) {
register unsigned int data;
unsigned int data;
#ifdef LITTLE
data = *s++;
*o++ = (data & 0xf800) >> 8 | (data & 0xe000) >> 13
@ -349,7 +349,7 @@ rgb565lsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
}
/* check for last remaining pixel */
if (width & 1) {
register unsigned short data;
unsigned short data;
#ifdef LITTLE
data = *((short *) s);
#else
@ -378,11 +378,11 @@ rgb565msb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
int bpl;
#ifdef LITTLE
register unsigned char *s; /* need to swap data order */
unsigned char *s; /* need to swap data order */
#else
register unsigned int *s; /* read 2 pixels at once */
unsigned int *s; /* read 2 pixels at once */
#endif
register unsigned short *o;
unsigned short *o;
unsigned char *srow = image->data, *orow = pixels;
width = image->width;
@ -397,7 +397,7 @@ rgb565msb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
#endif
o = (unsigned short *) orow;
for (xx = 1; xx < width; xx += 2) {
register unsigned int data;
unsigned int data;
#ifdef LITTLE
/* swap endianness first */
data = s[0] | s[1] << 8 | s[2] << 16 | s[3] << 24;
@ -420,7 +420,7 @@ rgb565msb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
}
/* check for last remaining pixel */
if (width & 1) {
register unsigned short data;
unsigned short data;
#ifdef LITTLE
data = *((short *) s);
data = ((data >> 8) & 0xff) | ((data & 0xff) << 8);
@ -449,11 +449,11 @@ rgb565alsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *
int bpl;
#ifdef LITTLE
register unsigned short *s; /* read 1 pixels at once */
unsigned short *s; /* read 1 pixels at once */
#else
register unsigned char *s;
unsigned char *s;
#endif
register unsigned int *o;
unsigned int *o;
unsigned char *srow = image->data, *orow = pixels;
@ -469,7 +469,7 @@ rgb565alsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *
#endif
o = (unsigned int *) orow;
for (xx = 0; xx < width; xx ++) {
register unsigned int data;
unsigned int data;
/* rrrrrggg gggbbbbb -> rrrrrRRR ggggggGG bbbbbBBB aaaaaaaa */
/* little endian: aaaaaaaa bbbbbBBB ggggggGG rrrrrRRR */
#ifdef LITTLE
@ -506,11 +506,11 @@ rgb565amsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *
int bpl;
#ifdef LITTLE
register unsigned char *s;
unsigned char *s;
#else
register unsigned short *s; /* read 1 pixels at once */
unsigned short *s; /* read 1 pixels at once */
#endif
register unsigned int *o;
unsigned int *o;
unsigned char *srow = image->data, *orow = pixels;
@ -522,7 +522,7 @@ rgb565amsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *
s = srow;
o = (unsigned int *) orow;
for (xx = 0; xx < width; xx ++) {
register unsigned int data;
unsigned int data;
/* rrrrrggg gggbbbbb -> rrrrrRRR gggggg00 bbbbbBBB aaaaaaaa */
/* little endian: aaaaaaaa bbbbbBBB gggggg00 rrrrrRRR */
#ifdef LITTLE
@ -559,11 +559,11 @@ rgb555lsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
int bpl;
#ifdef LITTLE
register unsigned int *s; /* read 2 pixels at once */
unsigned int *s; /* read 2 pixels at once */
#else
register unsigned char *s; /* read 2 pixels at once */
unsigned char *s; /* read 2 pixels at once */
#endif
register unsigned short *o;
unsigned short *o;
unsigned char *srow = image->data, *orow = pixels;
width = image->width;
@ -578,7 +578,7 @@ rgb555lsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
#endif
o = (unsigned short *) orow;
for (xx = 1; xx < width; xx += 2) {
register unsigned int data;
unsigned int data;
#ifdef LITTLE
data = *s++;
*o++ = (data & 0x7c00) >> 7 | (data & 0x7000) >> 12
@ -601,7 +601,7 @@ rgb555lsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
}
/* check for last remaining pixel */
if (width & 1) {
register unsigned short data;
unsigned short data;
#ifdef LITTLE
data = *((short *) s);
#else
@ -630,11 +630,11 @@ rgb555msb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
int bpl;
#ifdef LITTLE
register unsigned char *s; /* read 2 pixels at once */
unsigned char *s; /* read 2 pixels at once */
#else
register unsigned int *s; /* read 2 pixels at once */
unsigned int *s; /* read 2 pixels at once */
#endif
register unsigned short *o;
unsigned short *o;
unsigned char *srow = image->data, *orow = pixels;
width = image->width;
@ -645,7 +645,7 @@ rgb555msb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
s = srow;
o = (unsigned short *) orow;
for (xx = 1; xx < width; xx += 2) {
register unsigned int data;
unsigned int data;
#ifdef LITTLE
/* swap endianness first */
data = s[0] | s[1] << 8 | s[2] << 16 | s[3] << 24;
@ -668,7 +668,7 @@ rgb555msb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *c
}
/* check for last remaining pixel */
if (width & 1) {
register unsigned short data;
unsigned short data;
#ifdef LITTLE
data = *((short *) s);
data = ((data >> 8) & 0xff) | ((data & 0xff) << 8);
@ -697,11 +697,11 @@ rgb555alsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *
int bpl;
#ifdef LITTLE
register unsigned short *s; /* read 1 pixels at once */
unsigned short *s; /* read 1 pixels at once */
#else
register unsigned char *s;
unsigned char *s;
#endif
register unsigned int *o;
unsigned int *o;
unsigned char *srow = image->data, *orow = pixels;
@ -717,7 +717,7 @@ rgb555alsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *
#endif
o = (unsigned int *) orow;
for (xx = 0; xx < width; xx++) {
register unsigned int data;
unsigned int data;
/* rrrrrggg gggbbbbb -> rrrrrRRR gggggGGG bbbbbBBB aaaaaaaa */
/* little endian: aaaaaaaa bbbbbBBB gggggGGG rrrrrRRR */
#ifdef LITTLE
@ -754,11 +754,11 @@ rgb555amsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *
int bpl;
#ifdef LITTLE
register unsigned short *s; /* read 1 pixels at once */
unsigned short *s; /* read 1 pixels at once */
#else
register unsigned char *s;
unsigned char *s;
#endif
register unsigned int *o;
unsigned int *o;
unsigned char *srow = image->data, *orow = pixels;
@ -774,7 +774,7 @@ rgb555amsb (XImage *image, unsigned char *pixels, int rowstride, xlib_colormap *
#endif
o = (unsigned int *) orow;
for (xx = 0; xx < width; xx++) {
register unsigned int data;
unsigned int data;
/* rrrrrggg gggbbbbb -> rrrrrRRR gggggGGG bbbbbBBB aaaaaaaa */
/* little endian: aaaaaaaa bbbbbBBB gggggGGG rrrrrRRR */
#ifdef LITTLE

@ -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;

@ -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 ){

@ -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;

@ -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];

@ -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;

@ -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++; }

@ -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 )
;

@ -284,7 +284,7 @@ SWIG_TypeCheck(char *c, _swig_type_info *ty) {
SWIGSTATICRUNTIME(int)
SWIG_ConvertPtr(PyObject *obj, void **ptr, _swig_type_info *ty, int flags) {
unsigned long p;
register int d;
int d;
_swig_type_info *tc;
char *c;
static PyObject *SWIG_this = 0;

@ -25,8 +25,8 @@
void KoPointArray::translate( double dx, double dy )
{
register KoPoint *p = data();
register int i = size();
KoPoint *p = data();
int i = size();
KoPoint pt( dx, dy );
while ( i-- ) {
*p += pt;
@ -232,7 +232,7 @@ KoRect KoPointArray::boundingRect() const
{
if ( isEmpty() )
return KoRect( 0, 0, 0, 0 ); // null rectangle
register KoPoint *pd = data();
KoPoint *pd = data();
double minx, maxx, miny, maxy;
minx = maxx = pd->x();
miny = maxy = pd->y();

@ -259,8 +259,8 @@ typedef struct digest_impl_st
*/
static void __rtl_digest_swapLong (sal_uInt32 *pData, sal_uInt32 nDatLen)
{
register sal_uInt32 *X;
register int i, n;
sal_uInt32 *X;
int i, n;
X = pData;
n = nDatLen;
@ -476,10 +476,10 @@ static void __rtl_digest_initSHA (
*/
static void __rtl_digest_updateSHA (DigestContextSHA *ctx)
{
register sal_uInt32 A, B, C, D, E, T;
register sal_uInt32 *X;
sal_uInt32 A, B, C, D, E, T;
sal_uInt32 *X;
register DigestSHA_update_t *U;
DigestSHA_update_t *U;
U = ctx->m_update;
A = ctx->m_nA;
@ -589,10 +589,10 @@ static void __rtl_digest_endSHA (DigestContextSHA *ctx)
{
0x80, 0x00, 0x00, 0x00
};
register const sal_uInt8 *p = end;
const sal_uInt8 *p = end;
register sal_uInt32 *X;
register int i;
sal_uInt32 *X;
int i;
X = ctx->m_pData;
i = (ctx->m_nDatLen >> 2);

Loading…
Cancel
Save