[Emacs-diffs] /srv/bzr/emacs/trunk r102872: * fontset.c (free_realized_fontset): Mark unreachable code with if (0).

[Paul Eggert]

------------------------------------------------------------
revno: 102872 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-01-16 19:06:11 -0800
message:
  * fontset.c (free_realized_fontset): Mark unreachable code with if (0).
modified:
  src/ChangeLog
  src/fontset.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-01-17 02:55:28 +0000
+++ b/src/ChangeLog     2011-01-17 03:05:08 +0000
@@ -1,5 +1,9 @@
 2011-01-17  Paul Eggert  <address@hidden>
 
+       * 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 revno 95090 dated 2009-03-06,
        which fixed Bug#2370.  Caught by Sun cc.

=== modified file 'src/fontset.c'
--- a/src/fontset.c     2011-01-15 23:16:57 +0000
+++ b/src/fontset.c     2011-01-17 03:05:08 +0000
@@ -849,12 +849,12 @@
 {
   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 @@
   defsubr (&Sfontset_list_all);
 #endif
 }
-