diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2009-08-26 17:30:32 +0930 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-09-09 12:45:07 +0200 |
| commit | ce31ae860d25823f7b5b3140b74e8d83af9d6ed5 (patch) | |
| tree | 20943ea0a08238a810a92732f8b9d388c81a589b | |
| parent | 3dbdc27d14f159aa0db16615924a91efb960d951 (diff) | |
| download | samba-ce31ae860d25823f7b5b3140b74e8d83af9d6ed5.tar.gz | |
lib/tevent: remove spectacularly complicated manual subtraction
To be completely honest, I don't quite know whether to laugh or cry at
this one:
1 + (0xFFFFFFFF & ~(s.seen - s.count))
== 1 + (~(s.seen - s.count)) # s.seen, s.count are uint32_t
== s.count - s.seen # -A == ~A + 1
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(cherry picked from commit 4279879c9847ca069527e11ca934b8906009cad8)
(cherry picked from commit fdcc157d51cce8561df37fa9eed39332772bacb9)
| -rw-r--r-- | lib/tevent/tevent_signal.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c index f07de83a5ec..429995318be 100644 --- a/lib/tevent/tevent_signal.c +++ b/lib/tevent/tevent_signal.c @@ -70,10 +70,7 @@ static struct sig_state { */ static uint32_t sig_count(struct sigcounter s) { - if (s.count >= s.seen) { - return s.count - s.seen; - } - return 1 + (0xFFFFFFFF & ~(s.seen - s.count)); + return s.count - s.seen; } /* |