* NaN or Inf). In case of error, everything is invalid.
*/
GLbitfield rv;
- register unsigned int i;
- unsigned int bit;
+ unsigned i, bit;
/* This data structure defines the mapping between the current matrix
* mode and the desired matrix identifier.
*/
- static struct {
+ static const struct {
GLenum currentMode;
GLenum desiredMatrix;
} modes[] = {
* we can return immediately, as _mesa_GetInteger() will have
* logged the necessary error already.
*/
- for (i = 0; i < sizeof(modes)/sizeof(modes[0]); i++) {
+ for (i = 0; i < ARRAY_SIZE(modes); i++) {
if (modes[i].currentMode == currentMode) {
desiredMatrix = modes[i].desiredMatrix;
break;