[m-rev.] diff: avoid C warnings about I/O streams

[Zoltan Somogyi]

trace/mercury_trace_browse.c:
trace/mercury_trace_declarative.c:
trace/mercury_trace_external.c:
trace/mercury_trace_help.c:
	Eliminate C compiler warnings by eliminating some now unnecessary
	casts.

Zoltan.

cvs diff: Diffing .
cvs diff: Diffing analysis
cvs diff: Diffing bindist
cvs diff: Diffing boehm_gc
cvs diff: Diffing boehm_gc/Mac_files
cvs diff: Diffing boehm_gc/cord
cvs diff: Diffing boehm_gc/cord/private
cvs diff: Diffing boehm_gc/doc
cvs diff: Diffing boehm_gc/include
cvs diff: Diffing boehm_gc/include/private
cvs diff: Diffing boehm_gc/tests
cvs diff: Diffing browser
cvs diff: Diffing bytecode
cvs diff: Diffing compiler
cvs diff: Diffing compiler/notes
cvs diff: Diffing debian
cvs diff: Diffing deep_profiler
cvs diff: Diffing deep_profiler/notes
cvs diff: Diffing doc
cvs diff: Diffing extras
cvs diff: Diffing extras/aditi
cvs diff: Diffing extras/cgi
cvs diff: Diffing extras/complex_numbers
cvs diff: Diffing extras/complex_numbers/samples
cvs diff: Diffing extras/complex_numbers/tests
cvs diff: Diffing extras/concurrency
cvs diff: Diffing extras/curs
cvs diff: Diffing extras/curs/samples
cvs diff: Diffing extras/curses
cvs diff: Diffing extras/curses/sample
cvs diff: Diffing extras/dynamic_linking
cvs diff: Diffing extras/error
cvs diff: Diffing extras/graphics
cvs diff: Diffing extras/graphics/mercury_opengl
cvs diff: Diffing extras/graphics/mercury_tcltk
cvs diff: Diffing extras/graphics/samples
cvs diff: Diffing extras/graphics/samples/calc
cvs diff: Diffing extras/graphics/samples/maze
cvs diff: Diffing extras/graphics/samples/pent
cvs diff: Diffing extras/lazy_evaluation
cvs diff: Diffing extras/lex
cvs diff: Diffing extras/lex/samples
cvs diff: Diffing extras/lex/tests
cvs diff: Diffing extras/logged_output
cvs diff: Diffing extras/moose
cvs diff: Diffing extras/moose/samples
cvs diff: Diffing extras/morphine
cvs diff: Diffing extras/morphine/non-regression-tests
cvs diff: Diffing extras/morphine/scripts
cvs diff: Diffing extras/morphine/source
cvs diff: Diffing extras/odbc
cvs diff: Diffing extras/posix
cvs diff: Diffing extras/quickcheck
cvs diff: Diffing extras/quickcheck/tutes
cvs diff: Diffing extras/references
cvs diff: Diffing extras/references/samples
cvs diff: Diffing extras/references/tests
cvs diff: Diffing extras/stream
cvs diff: Diffing extras/trailed_update
cvs diff: Diffing extras/trailed_update/samples
cvs diff: Diffing extras/trailed_update/tests
cvs diff: Diffing extras/xml
cvs diff: Diffing extras/xml/samples
cvs diff: Diffing java
cvs diff: Diffing java/library
cvs diff: Diffing java/runtime
cvs diff: Diffing library
cvs diff: Diffing profiler
cvs diff: Diffing robdd
cvs diff: Diffing runtime
cvs diff: Diffing runtime/GETOPT
cvs diff: Diffing runtime/machdeps
cvs diff: Diffing samples
cvs diff: Diffing samples/c_interface
cvs diff: Diffing samples/c_interface/c_calls_mercury
cvs diff: Diffing samples/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/mercury_calls_c
cvs diff: Diffing samples/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/diff
cvs diff: Diffing samples/muz
cvs diff: Diffing samples/rot13
cvs diff: Diffing samples/solutions
cvs diff: Diffing samples/tests
cvs diff: Diffing samples/tests/c_interface
cvs diff: Diffing samples/tests/c_interface/c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/tests/c_interface/mercury_calls_c
cvs diff: Diffing samples/tests/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/tests/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/tests/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/tests/diff
cvs diff: Diffing samples/tests/muz
cvs diff: Diffing samples/tests/rot13
cvs diff: Diffing samples/tests/solutions
cvs diff: Diffing samples/tests/toplevel
cvs diff: Diffing scripts
cvs diff: Diffing tests
cvs diff: Diffing tests/benchmarks
cvs diff: Diffing tests/debugger
cvs diff: Diffing tests/debugger/declarative
cvs diff: Diffing tests/dppd
cvs diff: Diffing tests/general
cvs diff: Diffing tests/general/accumulator
cvs diff: Diffing tests/general/string_format
cvs diff: Diffing tests/general/structure_reuse
cvs diff: Diffing tests/grade_subdirs
cvs diff: Diffing tests/hard_coded
cvs diff: Diffing tests/hard_coded/exceptions
cvs diff: Diffing tests/hard_coded/purity
cvs diff: Diffing tests/hard_coded/sub-modules
cvs diff: Diffing tests/hard_coded/typeclasses
cvs diff: Diffing tests/invalid
cvs diff: Diffing tests/invalid/purity
cvs diff: Diffing tests/misc_tests
cvs diff: Diffing tests/mmc_make
cvs diff: Diffing tests/mmc_make/lib
cvs diff: Diffing tests/recompilation
cvs diff: Diffing tests/tabling
cvs diff: Diffing tests/term
cvs diff: Diffing tests/valid
cvs diff: Diffing tests/warnings
cvs diff: Diffing tools
cvs diff: Diffing trace
Index: trace/mercury_trace_browse.c
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/trace/mercury_trace_browse.c,v
retrieving revision 1.29
diff -u -b -r1.29 mercury_trace_browse.c
--- trace/mercury_trace_browse.c	20 Oct 2003 07:29:55 -0000	1.29
+++ trace/mercury_trace_browse.c	23 Jan 2004 23:12:33 -0000
@@ -59,15 +59,13 @@
 	if (format != MR_BROWSE_DEFAULT_FORMAT) {
 		MR_TRACE_CALL_MERCURY(
 			ML_BROWSE_browse_format(type_info, value,
-				(MR_Word) &mdb_in, (MR_Word) &mdb_out,
-				(MR_Word) format,
+				&mdb_in, &mdb_out, (MR_Word) format,
 				MR_trace_browser_persistent_state,
 				&MR_trace_browser_persistent_state);
 		);
 	} else {
 		MR_TRACE_CALL_MERCURY(
-			ML_BROWSE_browse(type_info, value,
-				(MR_Word) &mdb_in, (MR_Word) &mdb_out,
+			ML_BROWSE_browse(type_info, value, &mdb_in, &mdb_out,
 				&maybe_mark, MR_trace_browser_persistent_state,
 				&MR_trace_browser_persistent_state);
 		);
@@ -93,8 +91,7 @@
 		MR_TRACE_CALL_MERCURY(
 			ML_BROWSE_browse_format_synthetic(
 				(MR_String) (MR_Word) name, arg_list, is_func,
-				(MR_Word) &mdb_in, (MR_Word) &mdb_out,
-				(MR_Word) format,
+				&mdb_in, &mdb_out, (MR_Word) format,
 				MR_trace_browser_persistent_state,
 				&MR_trace_browser_persistent_state);
 		);
@@ -102,8 +99,8 @@
 		MR_TRACE_CALL_MERCURY(
 			ML_BROWSE_browse_synthetic(
 				(MR_String) (MR_Word) name, arg_list, is_func,
-				(MR_Word) &mdb_in, (MR_Word) &mdb_out,
-				&maybe_mark, MR_trace_browser_persistent_state,
+				&mdb_in, &mdb_out, &maybe_mark,
+				MR_trace_browser_persistent_state,
 				&MR_trace_browser_persistent_state);
 		);
 	}
@@ -129,8 +126,7 @@
 
 	MR_TRACE_CALL_MERCURY(
 		ML_BROWSE_browse_external(type_info, value,
-			(MR_Word) &MR_debugger_socket_in, 
-			(MR_Word) &MR_debugger_socket_out,
+			&MR_debugger_socket_in, &MR_debugger_socket_out,
 			MR_trace_browser_persistent_state,
 			&MR_trace_browser_persistent_state);
 	);
@@ -154,14 +150,13 @@
 	if (format != MR_BROWSE_DEFAULT_FORMAT) {
 		MR_TRACE_CALL_MERCURY(
 			ML_BROWSE_print_format(type_info, value,
-				(MR_Word) &mdb_out, (MR_Word) caller,
-				(MR_Word) format,
+				&mdb_out, caller, (MR_Word) format,
 				MR_trace_browser_persistent_state);
 		);
 	} else {
 		MR_TRACE_CALL_MERCURY(
-			ML_BROWSE_print(type_info, value,
-				(MR_Word) &mdb_out, (MR_Word) caller,
+			ML_BROWSE_print(type_info, value, &mdb_out,
+				(MR_Word) caller,
 				MR_trace_browser_persistent_state);
 		);
 	}
@@ -181,15 +176,14 @@
 		MR_TRACE_CALL_MERCURY(
 			ML_BROWSE_print_format_synthetic(
 				(MR_String) (MR_Word) name, arg_list, is_func,
-				(MR_Word) &mdb_out, (MR_Word) caller,
-				(MR_Word) format,
+				&mdb_out, caller, (MR_Word) format,
 				MR_trace_browser_persistent_state);
 		);
 	} else {
 		MR_TRACE_CALL_MERCURY(
 			ML_BROWSE_print_synthetic(
 				(MR_String) (MR_Word) name, arg_list, is_func,
-				(MR_Word) &mdb_out, (MR_Word) caller,
+				&mdb_out, (MR_Word) caller,
 				MR_trace_browser_persistent_state);
 		);
 	}
@@ -347,7 +341,7 @@
 
 	MR_TRACE_CALL_MERCURY(
 		ML_query(type, imports_list, (MR_String) options_on_heap,
-			(MR_Word) &mdb_in, (MR_Word) &mdb_out);
+			&mdb_in, &mdb_out);
 	);
 }
 
@@ -359,8 +353,7 @@
 {
 	MR_TRACE_CALL_MERCURY(
 		ML_query_external(type, imports_list,  options,
-			(MR_Word) &MR_debugger_socket_in, 
-			(MR_Word) &MR_debugger_socket_out);
+			&MR_debugger_socket_in, &MR_debugger_socket_out);
 	);
 }
 
Index: trace/mercury_trace_declarative.c
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/trace/mercury_trace_declarative.c,v
retrieving revision 1.64
diff -u -b -r1.64 mercury_trace_declarative.c
--- trace/mercury_trace_declarative.c	30 Sep 2003 09:13:13 -0000	1.64
+++ trace/mercury_trace_declarative.c	23 Jan 2004 23:13:20 -0000
@@ -1034,9 +1034,7 @@
 	if (! done) {
 		MR_TRACE_CALL_MERCURY(
 			MR_trace_node_store = 0;
-			MR_DD_decl_diagnosis_state_init(
-					(MR_Word) &mdb_in,
-					(MR_Word) &mdb_out,
+			MR_DD_decl_diagnosis_state_init(&mdb_in, &mdb_out,
 					&MR_trace_front_end_state);
 		);
 		done = MR_TRUE;
@@ -1256,8 +1254,7 @@
 		MR_mercuryfile_init(MR_trace_store_file, 1, &stream);
 
 		MR_TRACE_CALL_MERCURY(
-			MR_DD_save_trace((MR_Word) &stream,
-						MR_trace_node_store, root);
+			MR_DD_save_trace(&stream, MR_trace_node_store, root);
 		);
 
 		fclose(MR_trace_store_file);
Index: trace/mercury_trace_external.c
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/trace/mercury_trace_external.c,v
retrieving revision 1.71
diff -u -b -r1.71 mercury_trace_external.c
--- trace/mercury_trace_external.c	20 Oct 2003 07:29:55 -0000	1.71
+++ trace/mercury_trace_external.c	23 Jan 2004 23:14:26 -0000
@@ -946,7 +946,7 @@
 			layout->MR_sll_entry->MR_sle_detism,
 			(MR_String) (MR_Word) path,
 			lineno,
-			(MR_Word) &MR_debugger_socket_out);
+			&MR_debugger_socket_out);
 		    );
 	} else {
 		MR_TRACE_CALL_MERCURY(
@@ -967,7 +967,7 @@
 			layout->MR_sll_entry->MR_sle_detism,
 			(MR_String) (MR_Word) path,
 			lineno,
-			(MR_Word) &MR_debugger_socket_out);
+			&MR_debugger_socket_out);
 		    );
 	}
 }
@@ -979,7 +979,7 @@
 	ML_DI_output_current_vars(
 		var_list,
 		string_list,
-		(MR_Word) &MR_debugger_socket_out);
+		&MR_debugger_socket_out);
     );
 }
 
@@ -989,7 +989,7 @@
     MR_TRACE_CALL_MERCURY(
 	ML_DI_output_current_nth_var(
 		var,
-		(MR_Word) &MR_debugger_socket_out);
+		&MR_debugger_socket_out);
     );
 }
 
@@ -1000,7 +1000,7 @@
 	ML_DI_output_current_live_var_names(
 		var_names_list,
 		type_list,
-		(MR_Word) &MR_debugger_socket_out);
+		&MR_debugger_socket_out);
     );
 }
 
@@ -1013,7 +1013,7 @@
 
     MR_TRACE_CALL_MERCURY(
 	ML_DI_read_request_from_socket(
-		(MR_Word) &MR_debugger_socket_in, 
+		&MR_debugger_socket_in, 
 		debugger_request_ptr, 
 		debugger_request_type_ptr);
     );
Index: trace/mercury_trace_help.c
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/trace/mercury_trace_help.c,v
retrieving revision 1.21
diff -u -b -r1.21 mercury_trace_help.c
--- trace/mercury_trace_help.c	7 Nov 2003 04:33:21 -0000	1.21
+++ trace/mercury_trace_help.c	23 Jan 2004 23:14:58 -0000
@@ -124,7 +124,7 @@
 	MR_c_file_to_mercury_file(MR_mdb_out, &mdb_out);
 
 	MR_TRACE_CALL_MERCURY(
-		ML_HELP_help(MR_trace_help_system, (MR_Word) &mdb_out);
+		ML_HELP_help(MR_trace_help_system, &mdb_out);
 	);
 }
 
@@ -142,8 +142,7 @@
 
 	MR_c_file_to_mercury_file(MR_mdb_out, &mdb_out);
 	MR_TRACE_CALL_MERCURY(
-		ML_HELP_name(MR_trace_help_system, word_on_heap,
-			(MR_Word) &mdb_out);
+		ML_HELP_name(MR_trace_help_system, word_on_heap, &mdb_out);
 	);
 }
 
@@ -170,8 +169,7 @@
 
 	MR_c_file_to_mercury_file(MR_mdb_out, &mdb_out);
 	MR_TRACE_CALL_MERCURY(
-		ML_HELP_path(MR_trace_help_system, path,
-			(MR_Word) &mdb_out, &result);
+		ML_HELP_path(MR_trace_help_system, path, &mdb_out, &result);
 		error = ML_HELP_result_is_error(result, &msg);
 	);
 
cvs diff: Diffing util
cvs diff: Diffing vim
cvs diff: Diffing vim/after
cvs diff: Diffing vim/ftplugin
cvs diff: Diffing vim/syntax
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------