diff options
| author | Pierre Weis <Pierre.Weis@inria.fr> | 1998-12-02 10:39:54 +0000 |
|---|---|---|
| committer | Pierre Weis <Pierre.Weis@inria.fr> | 1998-12-02 10:39:54 +0000 |
| commit | b83b27899119824923f754caf251f17bc02bae3f (patch) | |
| tree | 2eaf8cb53c309d057cd1e5f8ccae26411b6d8311 | |
| parent | d0abd87e0bee6d1fad4eda5fbfbdeacb496e3bed (diff) | |
Warning du compilateur.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2210 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | debugger/debugcom.ml | 3 | ||||
| -rw-r--r-- | debugger/debugcom.mli | 1 | ||||
| -rw-r--r-- | debugger/frames.ml | 6 | ||||
| -rw-r--r-- | debugger/time_travel.ml | 2 | ||||
| -rw-r--r-- | otherlibs/unix/unix.ml | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/debugger/debugcom.ml b/debugger/debugcom.ml index ccb20b174..ac8103294 100644 --- a/debugger/debugcom.ml +++ b/debugger/debugcom.ml @@ -118,6 +118,9 @@ let initial_frame () = let pc = input_binary_int !conn.io_in in (stack_pos, pc) +let set_initial_frame () = + let _ = initial_frame () in () + (* Move up one frame *) (* Return stack position and current pc. If there's no frame above, return (-1, 0). *) diff --git a/debugger/debugcom.mli b/debugger/debugcom.mli index 9e00b289b..aef289cd7 100644 --- a/debugger/debugcom.mli +++ b/debugger/debugcom.mli @@ -58,6 +58,7 @@ val wait_child : Primitives.io_channel -> unit (* Move to initial frame (that of current function). *) (* Return stack position and current pc *) val initial_frame : unit -> int * int +val set_initial_frame : unit -> unit (* Get the current frame position *) (* Return stack position and current pc *) diff --git a/debugger/frames.ml b/debugger/frames.ml index 2464e815b..5f4f92e18 100644 --- a/debugger/frames.ml +++ b/debugger/frames.ml @@ -71,7 +71,7 @@ let select_frame frame_number = Some(move_up (frame_number - !current_frame) sel_event); current_frame := frame_number | _ -> - initial_frame(); + set_initial_frame(); selected_event := Some(move_up frame_number curr_event); current_frame := frame_number with Not_found -> @@ -90,7 +90,7 @@ let try_select_frame frame_number = (* Return to default frame (frame 0). *) let reset_frame () = - initial_frame(); + set_initial_frame(); selected_event := !current_event; current_frame := 0 @@ -105,7 +105,7 @@ let do_backtrace action = None -> Misc.fatal_error "Frames.do_backtrace" | Some curr_ev -> let (initial_sp, _) = get_frame() in - initial_frame(); + set_initial_frame(); let event = ref curr_ev in begin try while action (Some !event) do diff --git a/debugger/time_travel.ml b/debugger/time_travel.ml index 70d6ddceb..c5aa1a163 100644 --- a/debugger/time_travel.ml +++ b/debugger/time_travel.ml @@ -517,7 +517,7 @@ let finish () = prerr_endline "`finish' not meaningful in outermost frame."; raise Toplevel | Some curr_event -> - initial_frame(); + set_initial_frame(); let (frame, pc) = up_frame curr_event.ev_stacksize in if frame < 0 then begin prerr_endline "`finish' not meaningful in outermost frame."; diff --git a/otherlibs/unix/unix.ml b/otherlibs/unix/unix.ml index e9f96e10e..85919c32b 100644 --- a/otherlibs/unix/unix.ml +++ b/otherlibs/unix/unix.ml @@ -648,6 +648,6 @@ let establish_server server_fun sockaddr = server_fun inchan outchan; close_in inchan; close_out outchan - | id -> close s; waitpid [] id (* Reclaim the son *); () + | id -> close s; let _ = waitpid [] id (* Reclaim the son *) in () done |