Merge GDB 7.5.1

gdb/observer.sh

 #!/bin/sh -e
 
 # Make certain that the script is not running in an internationalized
 # environment.
 LANG=C ; export LANG
 LC_ALL=C ; export LC_ALL
 
 if test $# -ne 3
 then
     echo "Usage: $0 <h|inc> <observer.texi> <observer.out>" 1>&2
@@ skipping 118 matching lines @@
             cat<<EOF >>${otmp}
 struct ${event}_args { `echo "${formal}" | sed -e 's/,/;/g'`; };
 
 EOF
         fi
         cat <<EOF >>${otmp}
 static void
 observer_${event}_notification_stub (const void *data, const void *args_data)
 {
   observer_${event}_ftype *notify = (observer_${event}_ftype *) data;
+EOF
+
+        notify_args=`echo ${actual} | sed -e 's/\([a-z0-9_][a-z0-9_]*\)/args->\1/g'`
+
+        if test ! -z "${notify_args}"; then
+            cat<<EOF >>${otmp}
   const struct ${event}_args *args = args_data;
-  notify (`echo ${actual} | sed -e 's/\([a-z0-9_][a-z0-9_]*\)/args->\1/g'`);
+EOF
+        fi
+        cat <<EOF >>${otmp}
+  notify (${notify_args});
 }
 
 struct observer *
 observer_attach_${event} (observer_${event}_ftype *f)
 {
   return generic_observer_attach (&${event}_subject,
                                   &observer_${event}_notification_stub,
                                   (void *) f);
 }
 
@@ skipping 30 matching lines @@
 case $lang in
     h) cat <<EOF >>${otmp}
 
 #endif /* OBSERVER_H */
 EOF
 esac
 
 
 echo Moving ${otmp} to ${o}
 mv ${otmp} ${o}