epoxy_internal_has_gl_extension, epoxy_egl_version: add some missing … #118
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ebassi
requested changes
Apr 24, 2017
src/dispatch_common.c
Outdated
| @@ -478,6 +478,7 @@ epoxy_internal_has_gl_extension(const char *ext, bool invalid_op_mode) | |||
|
|
|||
| for (i = 0; i < num_extensions; i++) { | |||
| const char *gl_ext = (const char *)glGetStringi(GL_EXTENSIONS, i); | |||
| if(! gl_ext) return false; | |||
There was a problem hiding this comment.
It would be great if you could respect the coding style, and add a newline break for return false.
src/dispatch_egl.c
Outdated
| @@ -62,12 +62,16 @@ epoxy_egl_version(EGLDisplay dpy) | |||
| { | |||
| int major, minor; | |||
| const char *version_string; | |||
| int ret; | |||
| int ret=0, sscanf_ret; | |||
There was a problem hiding this comment.
Please, add a space between ret and =, and between = and 0.
src/dispatch_egl.c
Outdated
| ret = sscanf(version_string, "%d.%d", &major, &minor); | ||
| assert(ret == 2); | ||
| return major * 10 + minor; | ||
| if ((version_string = eglQueryString(dpy, EGL_VERSION))) |
There was a problem hiding this comment.
The coding style is also off, here.
It would be great to replace the whole block with a simple NULL check, e.g.:
version_string = eglQueryString(dpy, EGL_VERSION);
if (!version_string)
return 0;
```
|
sorry I copy-pasted the code from an outdated history, this should be better |
ebassi
reviewed
Apr 24, 2017
src/dispatch_common.c
Outdated
| @@ -443,6 +443,9 @@ bool | |||
| epoxy_extension_in_string(const char *extension_list, const char *ext) | |||
| { | |||
| const char *ptr = extension_list; | |||
| if (!ext) | |||
| return false; | |||
There was a problem hiding this comment.
This chunk generates a warning:
../src/dispatch_common.c: In function ‘epoxy_extension_in_string’:
../src/dispatch_common.c:449:5: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
int len = strlen(ext);
^~~
There was a problem hiding this comment.
should be better now
…nullpointer checks from https://bugzilla.redhat.com/show_bug.cgi?id=1395366 Related commit: b3b8bd9 Fix "epoxy_glx_version" to handle the case when GLX is not active on the display. Patch is tweak from the original version posted by Tom Horsley
ebassi
approved these changes
Apr 24, 2017
|
Thanks! |
|
thanks for merging! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…nullpointer checks from https://bugzilla.redhat.com/show_bug.cgi?id=1395366
Related commit: b3b8bd9
Fix "epoxy_glx_version" to handle the case when GLX is not active on the display.
Patch is tweak from the original version posted by Tom Horsley