more X memory macro fixes #605
Merged
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
uli42
approved these changes
Dec 14, 2017
| } | ||
|
|
||
| if (handler != NULL) | ||
| { | ||
| Xfree(handler); | ||
| free(handler); | ||
| } | ||
|
|
There was a problem hiding this comment.
could remove the check for NULL altogether here and at numerous other places
| @@ -4523,7 +4523,7 @@ static Bool _NXCollectInputFocusHandler(Display *dpy, xReply *rep, char *buf, | |||
|
|
|||
| DeqAsyncHandler(dpy, state -> handler); | |||
|
|
|||
| Xfree(state -> handler); | |||
| free(state -> handler); | |||
|
|
|||
| state -> handler = NULL; | |||
There was a problem hiding this comment.
I have introduced the FREE_SAFE macro to nxcomp. I suggest using it here, too. Would save many lines...
| Xfree(NXImageCache[NXImageCacheSize - 1].image); | ||
| Xfree(NXImageCache[NXImageCacheSize - 1].md5); | ||
| free(NXImageCache[NXImageCacheSize - 1].image -> data); | ||
| free(NXImageCache[NXImageCacheSize - 1].image); |
There was a problem hiding this comment.
maybe add a freeImage() function for that.
|
@uli42: Thanks for your comments. I will file a separate issue (or more than one) for those comments and do the merge (and release of 3.5.99.11) now. |
|
* |
They have been flawed ever since nxagent came up, as they were Xfree (non-capital f) always, but should have been XFree (capital F, defined in Xlibint.h and part of libNX_X11). . Probably this all should be free() all over the code (bearing in mind, that XFree() returns int, not void. But still... Fixes ArcticaProject#553.
sunweaver
force-pushed
the
pr/more-X-memory-macro-fixes
branch
from
168624a
to
5597f2e
Compare
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.
Two commits cleaning up Xfree() vs XFree() vs free() and Xmalloc() vs. malloc().
Addressing #553. Required for 3.5.99.11 release.