aboutsummaryrefslogtreecommitdiffstats
path: root/src/data.c
diff options
context:
space:
mode:
authorAndreas Schwab2014-07-26 13:58:24 +0200
committerAndreas Schwab2014-07-26 13:58:24 +0200
commit3acf58eec890249179b6f992c59f9adcf05b8ca8 (patch)
tree330419ff2ccea3f5aea9d49bd0e5aba8b1d386b2 /src/data.c
parenta072c708aaa91e61fa148b1a69884a40a5d8f9fb (diff)
downloademacs-3acf58eec890249179b6f992c59f9adcf05b8ca8.tar.gz
emacs-3acf58eec890249179b6f992c59f9adcf05b8ca8.zip
Reorder conditions that are written backwards
* alloc.c (xnmalloc, xnrealloc, xpalloc, make_save_value) (Fgarbage_collect): Reorder conditions that are written backwards. * data.c (cons_to_unsigned): Likewise. * dispnew.c (update_frame_1, sit_for): Likewise. * fileio.c (file_offset): Likewise. * filelock.c (read_lock_data, lock_file): Likewise. * fns.c (larger_vector, make_hash_table, Fmake_hash_table): Likewise. * font.c (font_intern_prop, font_style_symbolic): Likewise. * lisp.h (FIXNUM_OVERFLOW_P): Likewise. * lread.c (read1): Likewise. * minibuf.c (read_minibuf_noninteractive): Likewise. * nsterm.m (x_set_frame_alpha): Likewise. * process.c (wait_reading_process_output): Likewise. * region-cache.c (delete_cache_boundaries): Likewise. * xterm.c (x_set_frame_alpha): Likewise.
Diffstat (limited to 'src/data.c')
-rw-r--r--src/data.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/data.c b/src/data.c
index 3e651414e68..cb0e9a825fb 100644
--- a/src/data.c
+++ b/src/data.c
@@ -2460,13 +2460,13 @@ cons_to_unsigned (Lisp_Object c, uintmax_t max)
2460 uintmax_t val IF_LINT (= 0); 2460 uintmax_t val IF_LINT (= 0);
2461 if (INTEGERP (c)) 2461 if (INTEGERP (c))
2462 { 2462 {
2463 valid = 0 <= XINT (c); 2463 valid = XINT (c) >= 0;
2464 val = XINT (c); 2464 val = XINT (c);
2465 } 2465 }
2466 else if (FLOATP (c)) 2466 else if (FLOATP (c))
2467 { 2467 {
2468 double d = XFLOAT_DATA (c); 2468 double d = XFLOAT_DATA (c);
2469 if (0 <= d 2469 if (d >= 0
2470 && d < (max == UINTMAX_MAX ? (double) UINTMAX_MAX + 1 : max + 1)) 2470 && d < (max == UINTMAX_MAX ? (double) UINTMAX_MAX + 1 : max + 1))
2471 { 2471 {
2472 val = d; 2472 val = d;