(CHECK_CHARSET, CHECK_CHARSET_GET_ID, CHECK_CHARSET_GET_ATTR):

Don't use the inexistent return value of wrong_type_argument.

(CHECK_CHARSET, CHECK_CHARSET_GET_ID, CHECK_CHARSET_GET_ATTR):
Don't use the inexistent return value of wrong_type_argument.
43d1af23 · Stefan Monnier · d007adda · 43d1af23 · 43d1af23
Commit 43d1af23 authored Feb 22, 2008 by Stefan Monnier
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

src/ChangeLog src/ChangeLog +6 -0

src/charset.h src/charset.h +3 -3

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2008-02-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* charset.h (CHECK_CHARSET, CHECK_CHARSET_GET_ID)
+	(CHECK_CHARSET_GET_ATTR): Don't use the inexistent return value of
+	wrong_type_argument.
+
 2008-02-22  Kenichi Handa  <handa@ni.aist.go.jp>

 	* Makefile.in (lisp): Remove devanagari.el, kannada.el,

--- a/src/charset.h
+++ b/src/charset.h
@@ -339,7 +339,7 @@ extern struct charset *emacs_mule_charset[256];
 #define CHECK_CHARSET(x)					\
  do {								\
    if (! SYMBOLP (x) || CHARSET_SYMBOL_HASH_INDEX (x) < 0)	\
-      x = wrong_type_argument (Qcharsetp, (x));			\
+      wrong_type_argument (Qcharsetp, (x));			\
  } while (0)


@@ -350,7 +350,7 @@ extern struct charset *emacs_mule_charset[256];
    int idx;								\
 									\
    if (! SYMBOLP (x) || (idx = CHARSET_SYMBOL_HASH_INDEX (x)) < 0)	\
-      x = wrong_type_argument (Qcharsetp, (x));				\
+      wrong_type_argument (Qcharsetp, (x));				\
    id = XINT (AREF (HASH_VALUE (XHASH_TABLE (Vcharset_hash_table), idx), \
 		     charset_id));					\
  } while (0)
@@ -361,7 +361,7 @@ extern struct charset *emacs_mule_charset[256];
 #define CHECK_CHARSET_GET_ATTR(x, attr)				\
  do {									\
    if (!SYMBOLP (x) || NILP (attr = CHARSET_SYMBOL_ATTRIBUTES (x)))	\
-      x = wrong_type_argument (Qcharsetp, (x));				\
+      wrong_type_argument (Qcharsetp, (x));				\
  } while (0)