X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/7c420169baa7c50428589cca7f8eda71b462eb15..3ba7869ce8386d79d21f8e6f7d3c23088f9838ce:/lwlib/lwlib.c

diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index 1f434e5b61..9d8ec3330d 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -1,7 +1,7 @@
 /* A general interface to the widgets of different toolkits.
+
 Copyright (C) 1992, 1993 Lucid, Inc.
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2011  Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
@@ -25,7 +25,7 @@ Boston, MA 02110-1301, USA.  */
 #endif
 
 #include <setjmp.h>
-#include "../src/lisp.h"
+#include <lisp.h>
 
 #include <sys/types.h>
 #include <stdio.h>
@@ -110,9 +110,7 @@ safe_strdup (const char *s)
 {
   char *result;
   if (! s) return 0;
-  result = (char *) malloc (strlen (s) + 1);
-  if (! result)
-    return 0;
+  result = (char *) xmalloc (strlen (s) + 1);
   strcpy (result, s);
   return result;
 }
@@ -158,7 +156,7 @@ malloc_widget_value (void)
     }
   else
     {
-      wv = (widget_value *) malloc (sizeof (widget_value));
+      wv = (widget_value *) xmalloc (sizeof (widget_value));
       malloc_cpt++;
     }
   memset ((void*) wv, 0, sizeof (widget_value));
@@ -258,7 +256,7 @@ allocate_widget_info (const char* type,
                       lw_callback post_activate_cb,
                       lw_callback highlight_cb)
 {
-  widget_info* info = (widget_info*)malloc (sizeof (widget_info));
+  widget_info* info = (widget_info*) xmalloc (sizeof (widget_info));
   info->type = safe_strdup (type);
   info->name = safe_strdup (name);
   info->id = id;
@@ -300,7 +298,7 @@ static widget_instance *
 allocate_widget_instance (widget_info* info, Widget parent, Boolean pop_up_p)
 {
   widget_instance* instance =
-    (widget_instance*)malloc (sizeof (widget_instance));
+    (widget_instance*) xmalloc (sizeof (widget_instance));
   memset (instance, 0, sizeof *instance);
   instance->parent = parent;
   instance->pop_up_p = pop_up_p;
@@ -424,7 +422,7 @@ safe_strcmp (const char *s1, const char *s2)
 	      (nc == STRUCTURAL_CHANGE ? "structural" : "???")))),	\
 	   nc, desc, a1, a2)
 #else
-# define EXPLAIN(name, oc, nc, desc, a1, a2)
+# define EXPLAIN(name, oc, nc, desc, a1, a2) ((void) 0)
 #endif
 
 
@@ -914,8 +912,9 @@ destroy_one_instance (widget_instance *instance)
 	xaw_destroy_instance (instance);
       else
 #endif
-	/* do not remove the empty statement */
-	;
+	{
+	  /* Empty compound statement to terminate if-then-else chain.  */
+	}
     }
 
   free_widget_instance (instance);
@@ -980,7 +979,7 @@ lw_destroy_all_pop_ups (void)
 }
 
 #ifdef USE_MOTIF
-extern Widget first_child (/* Widget */);	/* garbage */
+extern Widget first_child (Widget);	/* garbage */
 #endif
 
 Widget
@@ -1421,6 +1420,3 @@ lw_separator_p (const char *label, enum menu_separator *type, int motif_p)
 
   return separator_p;
 }
-
-/* arch-tag: 3d730f36-a441-4a71-9971-48ef3b5a4d9f
-   (do not change this comment) */