# HG changeset patch
# User jwe
# Date 1077686059 0
# Node ID b3f20980be326fda07aea2a1f57345d1259a171c
# Parent  b022780ac0b494347788dc9d6d440dde192aa8f4
[project @ 2004-02-25 05:14:19 by jwe]

diff -r b022780ac0b4 -r b3f20980be32 liboctave/ChangeLog
--- a/liboctave/ChangeLog	Wed Feb 25 04:40:54 2004 +0000
+++ b/liboctave/ChangeLog	Wed Feb 25 05:14:19 2004 +0000
@@ -1,5 +1,16 @@
 2004-02-24  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* oct-rl-edit.c (octave_rl_set_startup_hook,
+	octave_rl_get_startup_hook, octave_rl_set_event_hook,
+	octave_rl_get_event_hook): Omit casts.
+	* oct-rl-edit.h (rl_startup_hook_fcn_ptr, rl_event_hook_fcn_ptr):
+	Return value for function pointer typedef is now int.
+	* cmd-edit.h (command_editor::startup_hook_fcn,
+	command_editor::event_hook_fcn): Likewise.
+	* cmd-hist.cc, cmd-hist.h (command_history::goto_mark,
+	command_history::do_goto_mark, gnu_history::do_goto_mark):
+	Return type is now int.  Return 0.
+
 	* EIG.cc (EIG::init, EIG::symmetric_init):
 	Query Lapack for workspace size.
 
diff -r b022780ac0b4 -r b3f20980be32 liboctave/cmd-edit.h
--- a/liboctave/cmd-edit.h	Wed Feb 25 04:40:54 2004 +0000
+++ b/liboctave/cmd-edit.h	Wed Feb 25 05:14:19 2004 +0000
@@ -39,9 +39,9 @@
 
 public:
 
-  typedef void (*startup_hook_fcn) (void);
+  typedef int (*startup_hook_fcn) (void);
 
-  typedef void (*event_hook_fcn) (void);
+  typedef int (*event_hook_fcn) (void);
 
   typedef std::string (*completion_fcn) (const std::string&, int);
 
diff -r b022780ac0b4 -r b3f20980be32 liboctave/cmd-hist.cc
--- a/liboctave/cmd-hist.cc	Wed Feb 25 04:40:54 2004 +0000
+++ b/liboctave/cmd-hist.cc	Wed Feb 25 05:14:19 2004 +0000
@@ -87,7 +87,7 @@
 
   void do_set_mark (int);
 
-  void do_goto_mark (void);
+  int do_goto_mark (void);
 
   void do_read (const std::string&, bool);
 
@@ -187,7 +187,7 @@
   mark = n;
 }
 
-void
+int
 gnu_history::do_goto_mark (void)
 {
   if (mark)
@@ -206,6 +206,8 @@
 
   // XXX FIXME XXX -- for operate_and_get_next.
   command_editor::restore_startup_hook ();
+
+  return 0;
 }
 
 void
@@ -528,11 +530,11 @@
     instance->do_set_mark (n);
 }
 
-void
+int
 command_history::goto_mark (void)
 {
-  if (instance_ok ())
-    instance->do_goto_mark ();
+  return (instance_ok ())
+    ? instance->do_goto_mark () : 0;
 }
 
 void
@@ -709,9 +711,10 @@
 {
 }
 
-void
+int
 command_history::do_goto_mark (void)
 {
+  return 0;
 }
 
 void
diff -r b022780ac0b4 -r b3f20980be32 liboctave/cmd-hist.h
--- a/liboctave/cmd-hist.h	Wed Feb 25 04:40:54 2004 +0000
+++ b/liboctave/cmd-hist.h	Wed Feb 25 05:14:19 2004 +0000
@@ -77,7 +77,7 @@
   // Gag.  This declaration has to match the Function typedef in
   // readline.h.
 
-  static void goto_mark (void);
+  static int goto_mark (void);
 
   static void read (bool = true);
 
@@ -157,7 +157,7 @@
 
   virtual void do_set_mark (int);
 
-  virtual void do_goto_mark (void);
+  virtual int do_goto_mark (void);
 
   virtual void do_read (const std::string&, bool);
 
diff -r b022780ac0b4 -r b3f20980be32 liboctave/oct-rl-edit.c
--- a/liboctave/oct-rl-edit.c	Wed Feb 25 04:40:54 2004 +0000
+++ b/liboctave/oct-rl-edit.c	Wed Feb 25 05:14:19 2004 +0000
@@ -239,27 +239,25 @@
 void
 octave_rl_set_startup_hook (rl_startup_hook_fcn_ptr f)
 {
-  void **fp = (void **) (&rl_startup_hook);
-  *fp = (void *) f;
+  rl_startup_hook = f;
 }
 
 rl_startup_hook_fcn_ptr
 octave_rl_get_startup_hook (void)
 {
-  return (rl_startup_hook_fcn_ptr) rl_startup_hook;
+  return rl_startup_hook;
 }
 
 void
 octave_rl_set_event_hook (rl_event_hook_fcn_ptr f)
 {
-  void **fp = (void **) (&rl_event_hook);
-  *fp = (void *) f;
+  rl_event_hook = f;
 }
 
 rl_event_hook_fcn_ptr
 octave_rl_get_event_hook (void)
 {
-  return (rl_event_hook_fcn_ptr) rl_event_hook;
+  return rl_event_hook;
 }
 
 char **
diff -r b022780ac0b4 -r b3f20980be32 liboctave/oct-rl-edit.h
--- a/liboctave/oct-rl-edit.h	Wed Feb 25 04:40:54 2004 +0000
+++ b/liboctave/oct-rl-edit.h	Wed Feb 25 05:14:19 2004 +0000
@@ -23,9 +23,9 @@
 #if !defined (octave_rl_edit_h)
 #define octave_rl_edit_h 1
 
-typedef void (*rl_startup_hook_fcn_ptr) (void);
+typedef int (*rl_startup_hook_fcn_ptr) (void);
 
-typedef void (*rl_event_hook_fcn_ptr) (void);
+typedef int (*rl_event_hook_fcn_ptr) (void);
 
 typedef int (*rl_fcn_ptr) (int, int);
 
diff -r b022780ac0b4 -r b3f20980be32 src/ChangeLog
--- a/src/ChangeLog	Wed Feb 25 04:40:54 2004 +0000
+++ b/src/ChangeLog	Wed Feb 25 05:14:19 2004 +0000
@@ -1,5 +1,7 @@
 2004-02-24  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* input.cc (input_event_hook): Return type is now int.  Return 0.
+
 	* file-io.cc (do_stream_open): Don't call ::error if stream can't
 	be created.  Don't call ::fopen if arch is invalid.  Set error
 	state for stream if fopen fails.
diff -r b022780ac0b4 -r b3f20980be32 src/input.cc
--- a/src/input.cc	Wed Feb 25 04:40:54 2004 +0000
+++ b/src/input.cc	Wed Feb 25 05:14:19 2004 +0000
@@ -949,7 +949,7 @@
 static std::string hook_fcn;
 static octave_value user_data;
 
-static void
+static int
 input_event_hook (void)
 {
   if (is_valid_function (hook_fcn))
@@ -965,7 +965,9 @@
       user_data = octave_value ();
 
       command_editor::set_event_hook (0);
-    }      
+    }
+
+  return 0;
 }
 
 DEFUN (input_event_hook, args, ,