changed coding style. added a NULL pointer check.

This commit is contained in:
Daniel Borca 2005-01-14 08:40:43 +00:00
parent 7da875d55f
commit aa7a27b38e

View file

@ -19,9 +19,9 @@
*/ */
/* /*
* DOS/DJGPP glut driver v1.4 for Mesa * DOS/DJGPP glut driver v1.5 for Mesa
* *
* Copyright (C) 2002 - Borca Daniel * Copyright (C) 2002 - Daniel Borca
* Email : dborca@yahoo.com * Email : dborca@yahoo.com
* Web : http://www.geocities.com/dborca * Web : http://www.geocities.com/dborca
*/ */
@ -34,39 +34,43 @@
#include "GL/dmesa.h" #include "GL/dmesa.h"
int APIENTRY glutExtensionSupported (const char *extension) int APIENTRY
glutExtensionSupported (const char *extension)
{ {
static const GLubyte *extensions = NULL; static const GLubyte *extensions = NULL;
const GLubyte *last, *where; const GLubyte *last, *where;
/* Extension names should not have spaces. */ /* Extension names should not have spaces. */
if (strchr(extension, ' ') || *extension == '\0') { if (strchr(extension, ' ') || *extension == '\0') {
return GL_FALSE; return GL_FALSE;
} }
/* Not my problem if you don't have a valid OpenGL context */ /* Not my problem if you don't have a valid OpenGL context */
if (!extensions) { if (!extensions) {
extensions = glGetString(GL_EXTENSIONS); extensions = glGetString(GL_EXTENSIONS);
} }
if (!extensions) {
return GL_FALSE;
}
/* Take care of sub-strings etc. */ /* Take care of sub-strings etc. */
for (last = extensions;;) { for (last = extensions;;) {
if ((where = (GLubyte *)strstr((const char *)last, extension)) == NULL) { if ((where = (GLubyte *)strstr((const char *)last, extension)) == NULL) {
return GL_FALSE; return GL_FALSE;
} }
last = where + strlen(extension); last = where + strlen(extension);
if (where == extensions || *(where - 1) == ' ') { if (where == extensions || *(where - 1) == ' ') {
if (*last == ' ' || *last == '\0') { if (*last == ' ' || *last == '\0') {
return GL_TRUE; return GL_TRUE;
} }
} }
} }
} }
GLUTproc APIENTRY GLUTproc APIENTRY
glutGetProcAddress (const char *procName) glutGetProcAddress (const char *procName)
{ {
/* TODO - handle glut namespace */ /* TODO - handle glut namespace */
return (GLUTproc)DMesaGetProcAddress(procName); return (GLUTproc)DMesaGetProcAddress(procName);
} }