Removed 'register' storage class compiler warnings

Change-Id: Iba89a9d0845bf7e816983f903281d33e273f6e35
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5558
Reviewed-by: X512 <danger_mail@list.ru>
Reviewed-by: Adrien Destugues <pulkomandy@pulkomandy.tk>
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
This commit is contained in:
Michael Brumbelow 2022-08-15 23:21:37 -04:00 committed by Adrien Destugues
parent 134fa6111f
commit 950809231f
18 changed files with 147 additions and 148 deletions

View File

@ -169,8 +169,8 @@ namespace agg
private:
AGG_INLINE const int8u* pixel() const
{
register int x = m_x;
register int y = m_y;
int x = m_x;
int y = m_y;
if(x < 0) x = 0;
if(y < 0) y = 0;
if(x >= (int)m_pixf->width()) x = m_pixf->width() - 1;

View File

@ -278,7 +278,7 @@ namespace agg
//------------------------------------------------------------------------
inline void trans_affine::transform(double* x, double* y) const
{
register double tx = *x;
double tx = *x;
*x = tx * m0 + *y * m2 + m4;
*y = tx * m1 + *y * m3 + m5;
}
@ -286,7 +286,7 @@ namespace agg
//------------------------------------------------------------------------
inline void trans_affine::transform_2x2(double* x, double* y) const
{
register double tx = *x;
double tx = *x;
*x = tx * m0 + *y * m2;
*y = tx * m1 + *y * m3;
}
@ -294,9 +294,9 @@ namespace agg
//------------------------------------------------------------------------
inline void trans_affine::inverse_transform(double* x, double* y) const
{
register double d = determinant();
register double a = (*x - m4) * d;
register double b = (*y - m5) * d;
double d = determinant();
double a = (*x - m4) * d;
double b = (*y - m5) * d;
*x = a * m3 - b * m2;
*y = b * m0 - a * m1;
}

View File

@ -111,7 +111,7 @@ class BRegion::Support {
BRegion* pReg,
clipping_rect* r1,
clipping_rect* r1End,
register clipping_rect* r2,
clipping_rect* r2,
clipping_rect* r2End,
int top,
int bottom);
@ -126,26 +126,26 @@ class BRegion::Support {
static void miRegionOp(BRegion* newReg,
const BRegion* reg1, const BRegion* reg2,
int (*overlapFunc)(
register BRegion* pReg,
register clipping_rect* r1,
BRegion* pReg,
clipping_rect* r1,
clipping_rect* r1End,
register clipping_rect* r2,
clipping_rect* r2,
clipping_rect* r2End,
int top,
int bottom),
int (*nonOverlap1Func)(
register BRegion* pReg,
register clipping_rect* r,
BRegion* pReg,
clipping_rect* r,
clipping_rect* rEnd,
register int top,
register int bottom),
int top,
int bottom),
int (*nonOverlap2Func)(
register BRegion* pReg,
register clipping_rect* r,
BRegion* pReg,
clipping_rect* r,
clipping_rect* rEnd,
register int top,
register int bottom));
int top,
int bottom));
};

View File

@ -71,8 +71,8 @@ static inline void
attach(OCTET *y, const OCTET *x, const uint32 anyA, const uint32 anyB,
const uint32 oddC, const uint32 oddD)
{
register OCTET _x;
register OCTET _y;
OCTET _x;
OCTET _y;
_x.D[0] = x->D[0];
_x.D[1] = x->D[1];
@ -95,8 +95,8 @@ static inline void
detach(OCTET *y, const OCTET *x, const uint32 sameA, const uint32 sameB,
const uint32 invoddC, const uint32 invoddD)
{
register OCTET _x;
register OCTET _y;
OCTET _x;
OCTET _y;
_x.D[0] = x->D[0];
_x.D[1] = x->D[1];

View File

@ -655,10 +655,10 @@ MixerCore::_MixThread()
uint32 dstSampleOffset
= fMixBufferChannelCount * sizeof(float);
uint32 srcSampleOffset = info->sample_offset;
register char* dst = (char*)&fMixBuffer[channel];
register char* src = (char*)info->base;
register float gain = info->gain;
register int j = fMixBufferFrameCount;
char* dst = (char*)&fMixBuffer[channel];
char* src = (char*)info->base;
float gain = info->gain;
int j = fMixBufferFrameCount;
do {
*(float*)dst += *(const float*)src * gain;
dst += dstSampleOffset;

View File

@ -209,9 +209,9 @@ HasKawamba()
void
ZeroFill(float *_dst, int32 _dst_sample_offset, int32 _sample_count)
{
register char * dst = (char *) _dst;
register int32 sample_count = _sample_count;
register int32 dst_sample_offset = _dst_sample_offset;
char * dst = (char *) _dst;
int32 sample_count = _sample_count;
int32 dst_sample_offset = _dst_sample_offset;
while (sample_count--) {
*(float *)dst = 0.0f;
dst += dst_sample_offset;

View File

@ -25,10 +25,10 @@ kernel(Resampler* object, const void *_src, int32 srcSampleOffset,
int32 srcSampleCount, void *_dest, int32 destSampleOffset,
int32 destSampleCount, float _gain)
{
register const char * src = (const char *)_src;
register char * dest = (char *)_dest;
register int32 count = destSampleCount;
register float gain = _gain * gnum / gden;
const char * src = (const char *)_src;
char * dest = (char *)_dest;
int32 count = destSampleCount;
float gain = _gain * gnum / gden;
if (srcSampleCount == destSampleCount) {
// optimized case for no resampling
@ -46,8 +46,8 @@ kernel(Resampler* object, const void *_src, int32 srcSampleOffset,
return;
}
register float delta = float(srcSampleCount) / float(destSampleCount);
register float current = 0.0f;
float delta = float(srcSampleCount) / float(destSampleCount);
float current = 0.0f;
// downsample
while (count--) {
@ -61,7 +61,7 @@ kernel(Resampler* object, const void *_src, int32 srcSampleOffset,
dest += destSampleOffset;
current += delta;
register int32 skipcount = (int32)current;
int32 skipcount = (int32)current;
current -= skipcount;
src += skipcount * srcSampleOffset;
}

View File

@ -17,15 +17,15 @@ gfx_conv_yuv410p_ycbcr422_c(AVFrame *in, AVFrame *out, int width, int height)
int i;
// bool toggle=false;
unsigned long *po_eol;
register unsigned long *p;
register unsigned long y1;
register unsigned long y2;
register unsigned short u;
register unsigned short v;
register unsigned long a;
register unsigned long b;
register unsigned long c;
register unsigned long d;
unsigned long *p;
unsigned long y1;
unsigned long y2;
unsigned short u;
unsigned short v;
unsigned long a;
unsigned long b;
unsigned long c;
unsigned long d;
// printf("[%ld, %ld, %ld] -> [%ld, %ld, %ld]\n", in->linesize[0],
// in->linesize[1], in->linesize[2], out->linesize[0], out->linesize[1],
// out->linesize[2]);
@ -87,15 +87,15 @@ void
gfx_conv_yuv420p_ycbcr422_c(AVFrame *in, AVFrame *out, int width, int height)
{
unsigned long *po_eol;
register unsigned long *p;
register unsigned long y1;
register unsigned long y2;
register unsigned long u;
register unsigned long v;
register unsigned long a;
register unsigned long b;
register unsigned long c;
register unsigned long d;
unsigned long *p;
unsigned long y1;
unsigned long y2;
unsigned long u;
unsigned long v;
unsigned long a;
unsigned long b;
unsigned long c;
unsigned long d;
// printf("[%ld, %ld, %ld] -> [%ld, %ld, %ld]\n", in->linesize[0],
// in->linesize[1], in->linesize[2], out->linesize[0], out->linesize[1],
// out->linesize[2]);

View File

@ -127,9 +127,9 @@ private:
#define CONVERT(src_type, dst_type) \
void src_type##_to_##dst_type (void *dst, const void *src, int32 count) \
{ \
register const src_type##_sample *s = (const src_type##_sample *) src; \
register dst_type *d = (dst_type *) dst; \
register int32 c = count >> 4; \
const src_type##_sample *s = (const src_type##_sample *) src; \
dst_type *d = (dst_type *) dst; \
int32 c = count >> 4; \
if (!c) goto fin1; \
do { \
d[0] = s[0]; d[1] = s[1]; \
@ -204,12 +204,12 @@ swap_int16(void *data, int32 count)
void
swap_int24(void *data, int32 count)
{
register int32 c = count;
register uint8 *d = (uint8 *)data;
int32 c = count;
uint8 *d = (uint8 *)data;
if (!c)
return;
do {
register uint8 temp = d[0];
uint8 temp = d[0];
d[0] = d[2];
d[2] = temp;
d += 3;

View File

@ -209,12 +209,12 @@ ColorRasterizer::MergePlaneBuffersToCurrentLine()
remainingPixels -= pixels;
if (remainingPixels >= 8) {
register const uchar
const uchar
red = fPlaneBuffers[0][i],
green = fPlaneBuffers[1][i],
blue = fPlaneBuffers[2][i];
register uchar value = 0;
uchar value = 0;
if (red & 0x80) value = 0x80;
if (red & 0x40) value |= 0x10;
if (red & 0x20) value |= 0x02;
@ -255,7 +255,7 @@ ColorRasterizer::MergePlaneBuffersToCurrentLine()
*out++ = value;
} else {
register const uchar
const uchar
red = fPlaneBuffers[0][i],
green = fPlaneBuffers[1][i],
blue = fPlaneBuffers[2][i];

View File

@ -72,7 +72,7 @@ static int i2;
unsigned int
ya_random(void)
{
register int ret = a[i1] + a[i2];
int ret = a[i1] + a[i2];
a[i1] = ret;
if (++i1 >= VECTOR_SIZE)
i1 = 0;

View File

@ -46,7 +46,7 @@ blend_gamma(uint16 b1, uint16 b2, uint16 b3, uint8 ba, // bottom components
*da = 255;
} else {
uint8 alphaRest = 255 - ta;
register uint32 alphaTemp = (65025 - alphaRest * (255 - ba));
uint32 alphaTemp = (65025 - alphaRest * (255 - ba));
uint32 alphaDest = ba * alphaRest;
uint32 alphaSrc = 255 * ta;
*d1 = kInverseGammaTable[(b1 * alphaDest + t1 * alphaSrc) / alphaTemp];

View File

@ -479,8 +479,8 @@ gen_crc_table()
{
// generate the table of CRC remainders for all possible bytes
register int i, j;
register unsigned long crc_accum;
int i, j;
unsigned long crc_accum;
for (i = 0; i < 256; i++) {
crc_accum = ((unsigned long) i << 24);
@ -502,7 +502,7 @@ update_crc(unsigned long crc_accum, const char *data_blk_ptr, int data_blk_size)
{
// update the CRC on the data block one byte at a time
register int i, j;
int i, j;
for (j = 0; j < data_blk_size; j++) {
i = ((int) (crc_accum >> 24) ^ *data_blk_ptr++) & 0xff;

View File

@ -213,7 +213,7 @@ BRegion::Support::DestroyRegion(BRegion* r)
void
BRegion::Support::miSetExtents(BRegion* pReg)
{
register clipping_rect* pBox;
clipping_rect* pBox;
clipping_rect* pBoxEnd;
clipping_rect* pExtents;
@ -265,12 +265,12 @@ BRegion::Support::miSetExtents(BRegion* pReg)
*/
void
BRegion::Support::XOffsetRegion(
register BRegion* pRegion,
register int x,
register int y)
BRegion* pRegion,
int x,
int y)
{
register int nbox;
register clipping_rect *pbox;
int nbox;
clipping_rect *pbox;
pbox = pRegion->fData;
nbox = pRegion->fCount;
@ -401,17 +401,17 @@ IndexRects(
*/
int
BRegion::Support::miIntersectO (
register BRegion* pReg,
register clipping_rect* r1,
BRegion* pReg,
clipping_rect* r1,
clipping_rect* r1End,
register clipping_rect* r2,
clipping_rect* r2,
clipping_rect* r2End,
int top,
int bottom)
{
register int left;
register int right;
register clipping_rect* pNextRect;
int left;
int right;
clipping_rect* pNextRect;
pNextRect = &pReg->fData[pReg->fCount];
@ -467,7 +467,7 @@ int
BRegion::Support::XIntersectRegion(
const BRegion* reg1,
const BRegion* reg2, /* source regions */
register BRegion* newReg) /* destination BRegion* */
BRegion* newReg) /* destination BRegion* */
{
/* check for trivial reject */
if ( (!(reg1->fCount)) || (!(reg2->fCount)) ||
@ -490,8 +490,8 @@ BRegion::Support::XIntersectRegion(
void
BRegion::Support::miRegionCopy(
register BRegion* dstrgn,
register const BRegion* rgn)
BRegion* dstrgn,
const BRegion* rgn)
{
*dstrgn = *rgn;
@ -652,13 +652,13 @@ TopRects(
*/
int
BRegion::Support::miCoalesce(
register BRegion* pReg, /* BRegion* to coalesce */
BRegion* pReg, /* BRegion* to coalesce */
int prevStart, /* Index of start of previous band */
int curStart) /* Index of start of current band */
{
register clipping_rect* pPrevBox; /* Current box in previous band */
register clipping_rect* pCurBox; /* Current box in current band */
register clipping_rect* pRegEnd; /* End of region */
clipping_rect* pPrevBox; /* Current box in previous band */
clipping_rect* pCurBox; /* Current box in current band */
clipping_rect* pRegEnd; /* End of region */
int curNumRects; /* Number of rectangles in current
* band */
int prevNumRects; /* Number of rectangles in previous
@ -802,48 +802,48 @@ BRegion::Support::miCoalesce(
*/
void
BRegion::Support::miRegionOp(
register BRegion* newReg, /* Place to store result */
BRegion* newReg, /* Place to store result */
const BRegion* reg1, /* First region in operation */
const BRegion* reg2, /* 2d region in operation */
int (*overlapFunc)(
register BRegion* pReg,
register clipping_rect* r1,
BRegion* pReg,
clipping_rect* r1,
clipping_rect* r1End,
register clipping_rect* r2,
clipping_rect* r2,
clipping_rect* r2End,
int top,
int bottom), /* Function to call for over-
* lapping bands */
int (*nonOverlap1Func)(
register BRegion* pReg,
register clipping_rect* r,
BRegion* pReg,
clipping_rect* r,
clipping_rect* rEnd,
register int top,
register int bottom), /* Function to call for non-
int top,
int bottom), /* Function to call for non-
* overlapping bands in region
* 1 */
int (*nonOverlap2Func)(
register BRegion* pReg,
register clipping_rect* r,
BRegion* pReg,
clipping_rect* r,
clipping_rect* rEnd,
register int top,
register int bottom)) /* Function to call for non-
int top,
int bottom)) /* Function to call for non-
* overlapping bands in region
* 2 */
{
register clipping_rect* r1; /* Pointer into first region */
register clipping_rect* r2; /* Pointer into 2d region */
clipping_rect* r1; /* Pointer into first region */
clipping_rect* r2; /* Pointer into 2d region */
clipping_rect* r1End; /* End of 1st region */
clipping_rect* r2End; /* End of 2d region */
register int ybot; /* Bottom of intersection */
register int ytop; /* Top of intersection */
int ybot; /* Bottom of intersection */
int ytop; /* Top of intersection */
// clipping_rect* oldRects; /* Old fData for newReg */
int prevBand; /* Index of start of
* previous band in newReg */
int curBand; /* Index of start of current
* band in newReg */
register clipping_rect* r1BandEnd; /* End of current band in r1 */
register clipping_rect* r2BandEnd; /* End of current band in r2 */
clipping_rect* r1BandEnd; /* End of current band in r1 */
clipping_rect* r2BandEnd; /* End of current band in r2 */
int top; /* Top of non-overlapping
* band */
int bot; /* Bottom of non-overlapping
@ -1104,11 +1104,11 @@ BRegion::Support::miRegionOp(
*-----------------------------------------------------------------------
*/
int
BRegion::Support::miUnionNonO(register BRegion* pReg,
register clipping_rect* r, clipping_rect* rEnd,
register int top, register int bottom)
BRegion::Support::miUnionNonO(BRegion* pReg,
clipping_rect* r, clipping_rect* rEnd,
int top, int bottom)
{
register clipping_rect* pNextRect = &pReg->fData[pReg->fCount];
clipping_rect* pNextRect = &pReg->fData[pReg->fCount];
assert(top < bottom);
@ -1147,15 +1147,15 @@ BRegion::Support::miUnionNonO(register BRegion* pReg,
int
BRegion::Support::miUnionO (
register BRegion* pReg,
register clipping_rect* r1,
BRegion* pReg,
clipping_rect* r1,
clipping_rect* r1End,
register clipping_rect* r2,
clipping_rect* r2,
clipping_rect* r2End,
register int top,
register int bottom)
int top,
int bottom)
{
register clipping_rect* pNextRect;
clipping_rect* pNextRect;
pNextRect = &pReg->fData[pReg->fCount];
@ -1299,13 +1299,13 @@ BRegion::Support::XUnionRegion(
*/
int
BRegion::Support::miSubtractNonO1 (
register BRegion* pReg,
register clipping_rect* r,
BRegion* pReg,
clipping_rect* r,
clipping_rect* rEnd,
register int top,
register int bottom)
int top,
int bottom)
{
register clipping_rect* pNextRect;
clipping_rect* pNextRect;
pNextRect = &pReg->fData[pReg->fCount];
@ -1345,16 +1345,16 @@ BRegion::Support::miSubtractNonO1 (
*/
int
BRegion::Support::miSubtractO(
register BRegion* pReg,
register clipping_rect* r1,
BRegion* pReg,
clipping_rect* r1,
clipping_rect* r1End,
register clipping_rect* r2,
clipping_rect* r2,
clipping_rect* r2End,
register int top,
register int bottom)
int top,
int bottom)
{
register clipping_rect* pNextRect;
register int left;
clipping_rect* pNextRect;
int left;
left = r1->left;
@ -1496,7 +1496,7 @@ int
BRegion::Support::XSubtractRegion(
const BRegion* regM,
const BRegion* regS,
register BRegion* regD)
BRegion* regD)
{
/* check for trivial reject */
if ( (!(regM->fCount)) || (!(regS->fCount)) ||
@ -1564,12 +1564,12 @@ BRegion::Support::XPointInRegion(
int
BRegion::Support::XRectInRegion(
register const BRegion* region,
const BRegion* region,
const clipping_rect& rect)
{
register clipping_rect* pbox;
register clipping_rect* pboxEnd;
register const clipping_rect* prect = &rect;
clipping_rect* pbox;
clipping_rect* pboxEnd;
const clipping_rect* prect = &rect;
bool partIn, partOut;
int rx = prect->left;

View File

@ -71,7 +71,7 @@ static char *strscan (char *search, char *what)
static int
ReadInteger(char *string, char **NextString)
{
register int Result = 0;
int Result = 0;
int Sign = 1;
if (*string == '+')
@ -96,7 +96,7 @@ int XParseGeometry (char *string, int *x, int *y,
unsigned int *width, unsigned int *height)
{
int mask = NoValue;
register char *strind;
char *strind;
unsigned int tempWidth=0, tempHeight=0;
int tempX=0, tempY=0;
char *nextCharacter;

View File

@ -170,7 +170,7 @@ DNSTools::GetDNSServers(BObjectList<BString>* serverList)
path.Append("network/resolv.conf");
register FILE* fp = fopen(path.Path(), "r");
FILE* fp = fopen(path.Path(), "r");
if (fp == NULL) {
fprintf(stderr, "failed to open '%s' to read nameservers: %s\n",
path.Path(), strerror(errno));
@ -179,8 +179,7 @@ DNSTools::GetDNSServers(BObjectList<BString>* serverList)
int nserv = 0;
char buf[1024];
register char *cp; //, **pp;
// register int n;
char *cp; //, **pp;
int MAXNS = 2;
// read the config file

View File

@ -250,12 +250,12 @@ struct BilinearDefault :
const uint16 wBottom = 255 - this->fWeightsY[y1].weight;
// buffer offset into source (top row)
register const uint8* src = this->fSource->row_ptr(
const uint8* src = this->fSource->row_ptr(
this->fWeightsY[y1].index);
// buffer handle for destination to be incremented per
// pixel
register uint8* d = this->fDestination;
uint8* d = this->fDestination;
for (int32 x = xIndexL; x <= xIndexMax; x++) {
const uint8* s = src + this->fWeightsX[x].index;
@ -291,10 +291,10 @@ struct BilinearDefault :
// last row of pixels if necessary
// buffer offset into source (bottom row)
register const uint8* src
const uint8* src
= this->fSource->row_ptr(this->fWeightsY[y2].index);
// buffer handle for destination to be incremented per pixel
register uint8* d = this->fDestination;
uint8* d = this->fDestination;
if (yMax < y2) {
for (int32 x = xIndexL; x <= xIndexMax; x++) {
@ -332,10 +332,10 @@ struct BilinearLowFilterRatio :
const uint16 wBottom = 255 - fWeightsY[y1].weight;
// buffer offset into source (top row)
register const uint8* src = fSource->row_ptr(fWeightsY[y1].index);
const uint8* src = fSource->row_ptr(fWeightsY[y1].index);
// buffer handle for destination to be incremented per
// pixel
register uint8* d = fDestination;
uint8* d = fDestination;
if (wTop == 255) {
for (int32 x = xIndexL; x <= xIndexR; x++) {
@ -451,9 +451,9 @@ struct BilinearSimd : DrawBitmapBilinearOptimized<BilinearSimd> {
// last row of pixels if necessary
// buffer offset into source (bottom row)
register const uint8* src = fSource->row_ptr(fWeightsY[y2].index);
const uint8* src = fSource->row_ptr(fWeightsY[y2].index);
// buffer handle for destination to be incremented per pixel
register uint8* d = fDestination;
uint8* d = fDestination;
if (yMax < y2) {
for (int32 x = xIndexL; x <= xIndexMax; x++) {

View File

@ -121,9 +121,9 @@ struct DrawBitmapNearestNeighborCopy {
for (; y1 <= y2; y1++) {
// buffer offset into source (top row)
register const uint8* src = bitmap.row_ptr(yIndices[y1]);
const uint8* src = bitmap.row_ptr(yIndices[y1]);
// buffer handle for destination to be incremented per pixel
register uint32* d = (uint32*)dst;
uint32* d = (uint32*)dst;
for (int32 x = xIndexL; x <= xIndexR; x++) {
*d = *(uint32*)(src + xIndices[x]);