aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert <[email protected]>2011-01-16 19:05:08 -0800
committerPaul Eggert <[email protected]>2011-01-16 19:05:08 -0800
commit97be3ce36c97d85b5f243cc1e1a14985164a9bf3 (patch)
tree2199274d28e88e575fab37c055d49931b1929daf
parent9fba3563f1c43c485cea79521d48024202b10203 (diff)
* fontset.c (free_realized_fontset): Mark unreachable code with if (0).
Previously it was marked by preceding it with "return;", but Sun cc complains about this.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/fontset.c13
2 files changed, 10 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cfaaf4c908..698c5bd4cd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
2011-01-17 Paul Eggert <[email protected]>
+ * fontset.c (free_realized_fontset): Mark unreachable code with if (0).
+ Previously it was marked by preceding it with "return;", but
+ Sun cc complains about this.
+
* coding.c (decode_coding_emacs_mule): Remove unreachable code.
This is a typo left over from 2009-03-06T07:51:[email protected],
which fixed Bug#2370. Caught by Sun cc.
diff --git a/src/fontset.c b/src/fontset.c
index c38b01d472..8d58f4cee9 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -849,12 +849,12 @@ free_realized_fontset (FRAME_PTR f, Lisp_Object fontset)
{
Lisp_Object tail;
- return;
- for (tail = FONTSET_OBJLIST (fontset); CONSP (tail); tail = XCDR (tail))
- {
- xassert (FONT_OBJECT_P (XCAR (tail)));
- font_close_object (f, XCAR (tail));
- }
+ if (0)
+ for (tail = FONTSET_OBJLIST (fontset); CONSP (tail); tail = XCDR (tail))
+ {
+ xassert (FONT_OBJECT_P (XCAR (tail)));
+ font_close_object (f, XCAR (tail));
+ }
}
/* Free fontset of FACE defined on frame F. Called from
@@ -2263,4 +2263,3 @@ at the vertical center of lines. */);
defsubr (&Sfontset_list_all);
#endif
}
-