Replace SIGFUNC by sighandler_t #278
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
SIGFUNC is mainly used as a type handled by signal() resp. sigaction(). This is all replaced by void (*)(int). sighandler_t itself is a GNU extension which we do not use here for better portability. The only place where SIGFUNC is still there is one place zxwhen.c, because here the call signature is different.
Make sure that sigactions and sighandlers are not intermixed.
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.
The global C type
SIGFUNCwas used of a generic signal handling function type. However, this was used for three incompatible function types:C signal handlers (
void (*)(int)), i.e. a function called with the signal numberC signal actions (
void (*)(int, siginfo_t *, void *)), i.e. a function called with the signal number, additional signal information, and some payload,IRAF signal handlers (
void (*)(XINT *, XINT *)), i.e. a function called with a pointer to the signal number and a pointer to the next handler.Replacing these with proper types leaves only the last case in
zxwhen.cas a use forSIGFUNC. However, this type is not used outside ofzxwhen.c. As IRAF/SPP doesn't generally support function prototypes, it doesn't make sense to have it exposed anymore.Fixing this, a bug in
zxwhen.cwas discovered and fixed where the result of setsig() was compared toSIG_IGNiraf/unix/os/zxwhen.c
Lines 225 to 227 in d057e31
however setsig() only returns a the return status of sigaction() (0 on success)
iraf/unix/os/zxwhen.c
Lines 264 to 266 in d057e31