[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108805: * lisp.h (CHECK_RANGED_INTEG
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108805: * lisp.h (CHECK_RANGED_INTEGER): Make value to check the first |
Date: |
Sat, 30 Jun 2012 11:13:54 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108805
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sat 2012-06-30 11:13:54 +0200
message:
* lisp.h (CHECK_RANGED_INTEGER): Make value to check the first
argument.
* character.c, charset.c, menu.c, process.c, window.c: Adjust all
uses.
modified:
src/ChangeLog
src/character.c
src/charset.c
src/lisp.h
src/menu.c
src/process.c
src/window.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-06-29 18:52:54 +0000
+++ b/src/ChangeLog 2012-06-30 09:13:54 +0000
@@ -1,3 +1,10 @@
+2012-06-30 Andreas Schwab <address@hidden>
+
+ * lisp.h (CHECK_RANGED_INTEGER): Make value to check the first
+ argument.
+ * character.c, charset.c, menu.c, process.c, window.c: Adjust all
+ uses.
+
2012-06-29 Eli Zaretskii <address@hidden>
* xdisp.c (try_window_id): Undo last change.
=== modified file 'src/character.c'
--- a/src/character.c 2012-06-26 02:33:51 +0000
+++ b/src/character.c 2012-06-30 09:13:54 +0000
@@ -927,7 +927,7 @@
for (i = 0; i < n; i++)
{
- CHECK_RANGED_INTEGER (0, args[i], 255);
+ CHECK_RANGED_INTEGER (args[i], 0, 255);
*p++ = XINT (args[i]);
}
=== modified file 'src/charset.c'
--- a/src/charset.c 2012-06-29 06:28:37 +0000
+++ b/src/charset.c 2012-06-30 09:13:54 +0000
@@ -878,9 +878,9 @@
min_byte_obj = Faref (val, make_number (i * 2));
max_byte_obj = Faref (val, make_number (i * 2 + 1));
- CHECK_RANGED_INTEGER (0, min_byte_obj, 255);
+ CHECK_RANGED_INTEGER (min_byte_obj, 0, 255);
min_byte = XINT (min_byte_obj);
- CHECK_RANGED_INTEGER (min_byte, max_byte_obj, 255);
+ CHECK_RANGED_INTEGER (max_byte_obj, min_byte, 255);
max_byte = XINT (max_byte_obj);
charset.code_space[i * 4] = min_byte;
charset.code_space[i * 4 + 1] = max_byte;
@@ -898,7 +898,7 @@
charset.dimension = dimension;
else
{
- CHECK_RANGED_INTEGER (1, val, 4);
+ CHECK_RANGED_INTEGER (val, 1, 4);
charset.dimension = XINT (val);
}
@@ -991,7 +991,7 @@
charset.iso_revision = -1;
else
{
- CHECK_RANGED_INTEGER (-1, val, 63);
+ CHECK_RANGED_INTEGER (val, -1, 63);
charset.iso_revision = XINT (val);
}
=== modified file 'src/lisp.h'
--- a/src/lisp.h 2012-06-26 05:00:30 +0000
+++ b/src/lisp.h 2012-06-30 09:13:54 +0000
@@ -1716,7 +1716,7 @@
#define CHECK_NATNUM(x) \
CHECK_TYPE (NATNUMP (x), Qwholenump, x)
-#define CHECK_RANGED_INTEGER(lo, x, hi)
\
+#define CHECK_RANGED_INTEGER(x, lo, hi)
\
do { \
CHECK_NUMBER (x); \
if (! ((lo) <= XINT (x) && XINT (x) <= (hi))) \
@@ -1730,9 +1730,9 @@
#define CHECK_TYPE_RANGED_INTEGER(type, x) \
do { \
if (TYPE_SIGNED (type)) \
- CHECK_RANGED_INTEGER (TYPE_MINIMUM (type), x, TYPE_MAXIMUM (type)); \
+ CHECK_RANGED_INTEGER (x, TYPE_MINIMUM (type), TYPE_MAXIMUM (type)); \
else \
- CHECK_RANGED_INTEGER (0, x, TYPE_MAXIMUM (type));
\
+ CHECK_RANGED_INTEGER (x, 0, TYPE_MAXIMUM (type));
\
} while (0)
#define CHECK_MARKER(x) \
=== modified file 'src/menu.c'
--- a/src/menu.c 2012-06-28 07:50:27 +0000
+++ b/src/menu.c 2012-06-30 09:13:54 +0000
@@ -1198,14 +1198,16 @@
but I don't want to make one now. */
CHECK_WINDOW (window);
- CHECK_RANGED_INTEGER ((xpos < INT_MIN - MOST_NEGATIVE_FIXNUM
+ CHECK_RANGED_INTEGER (x,
+ (xpos < INT_MIN - MOST_NEGATIVE_FIXNUM
? (EMACS_INT) INT_MIN - xpos
: MOST_NEGATIVE_FIXNUM),
- x, INT_MAX - xpos);
- CHECK_RANGED_INTEGER ((ypos < INT_MIN - MOST_NEGATIVE_FIXNUM
+ INT_MAX - xpos);
+ CHECK_RANGED_INTEGER (y,
+ (ypos < INT_MIN - MOST_NEGATIVE_FIXNUM
? (EMACS_INT) INT_MIN - ypos
: MOST_NEGATIVE_FIXNUM),
- y, INT_MAX - ypos);
+ INT_MAX - ypos);
xpos += XINT (x);
ypos += XINT (y);
=== modified file 'src/process.c'
--- a/src/process.c 2012-06-28 07:50:27 +0000
+++ b/src/process.c 2012-06-30 09:13:54 +0000
@@ -1028,8 +1028,8 @@
(register Lisp_Object process, Lisp_Object height, Lisp_Object width)
{
CHECK_PROCESS (process);
- CHECK_RANGED_INTEGER (0, height, INT_MAX);
- CHECK_RANGED_INTEGER (0, width, INT_MAX);
+ CHECK_RANGED_INTEGER (height, 0, INT_MAX);
+ CHECK_RANGED_INTEGER (width, 0, INT_MAX);
if (XPROCESS (process)->infd < 0
|| set_window_size (XPROCESS (process)->infd,
=== modified file 'src/window.c'
--- a/src/window.c 2012-06-29 11:48:08 +0000
+++ b/src/window.c 2012-06-30 09:13:54 +0000
@@ -6163,7 +6163,7 @@
if (!NILP (width))
{
- CHECK_RANGED_INTEGER (0, width, INT_MAX);
+ CHECK_RANGED_INTEGER (width, 0, INT_MAX);
if (XINT (width) == 0)
vertical_type = Qnil;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108805: * lisp.h (CHECK_RANGED_INTEGER): Make value to check the first,
Andreas Schwab <=