diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-05-16 00:10:39 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-05-16 00:10:39 -0700 |
| commit | cdd0de4b056b4612e055fa15f65af118dafc9b18 (patch) | |
| tree | a9d72533fb38b82969308316c958a3263d85d10d /lib/sig2str.c | |
| parent | 9df4ec5e9044e92e792ba9e8cb714603e32c5cc5 (diff) | |
| download | emacs-cdd0de4b056b4612e055fa15f65af118dafc9b18.tar.gz emacs-cdd0de4b056b4612e055fa15f65af118dafc9b18.tar.bz2 emacs-cdd0de4b056b4612e055fa15f65af118dafc9b18.zip | |
Merge from gnulib.
2013-05-15 manywarnings: update for GCC 4.8.0
2013-05-15 stdio: use __REDIRECT for fwrite, fwrite_unlocked
2013-05-15 sig2str, stdio, warnings: port to clang
Diffstat (limited to 'lib/sig2str.c')
| -rw-r--r-- | lib/sig2str.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/sig2str.c b/lib/sig2str.c index 8b36e2facf0..6ead2a71d13 100644 --- a/lib/sig2str.c +++ b/lib/sig2str.c @@ -325,21 +325,25 @@ sig2str (int signum, char *signame) { int rtmin = SIGRTMIN; int rtmax = SIGRTMAX; + int base, delta; if (! (rtmin <= signum && signum <= rtmax)) return -1; if (signum <= rtmin + (rtmax - rtmin) / 2) { - int delta = signum - rtmin; - sprintf (signame, delta ? "RTMIN+%d" : "RTMIN", delta); + strcpy (signame, "RTMIN"); + base = rtmin; } else { - int delta = rtmax - signum; - sprintf (signame, delta ? "RTMAX-%d" : "RTMAX", delta); + strcpy (signame, "RTMAX"); + base = rtmax; } + delta = signum - base; + if (delta != 0) + sprintf (signame + 5, "%+d", delta); return 0; } } |