[gs-cvs] rev 6913 - trunk/gs/src

[ray at ghostscript.com]

Author: ray
Date: 2006-07-12 14:46:07 -0700 (Wed, 12 Jul 2006)
New Revision: 6913

Modified:
   trunk/gs/src/imain.c
   trunk/gs/src/sfxstdio.c
   trunk/gs/src/zfproc.c
   trunk/gs/src/ziodevsc.c
Log:
Clean up some gcc warnings created by last commit.


Modified: trunk/gs/src/imain.c
===================================================================
--- trunk/gs/src/imain.c	2006-07-12 21:30:00 UTC (rev 6912)
+++ trunk/gs/src/imain.c	2006-07-12 21:46:07 UTC (rev 6913)
@@ -206,9 +206,6 @@
 gs_main_interpret(gs_main_instance *minst, ref * pref, int user_errors, 
 	int *pexit_code, ref * perror_object)
 {
-    i_ctx_t *i_ctx_p;
-    ref refnul;
-    ref refpop;
     int code;
 
     /* set interpreter pointer to lib_path */

Modified: trunk/gs/src/sfxstdio.c
===================================================================
--- trunk/gs/src/sfxstdio.c	2006-07-12 21:30:00 UTC (rev 6912)
+++ trunk/gs/src/sfxstdio.c	2006-07-12 21:46:07 UTC (rev 6913)
@@ -43,6 +43,8 @@
 
 extern const uint file_default_buffer_size;
 
+stream *file_alloc_stream(gs_memory_t *, client_name_t);
+
 /* Prepare a stream with a file name. */
 /* Return 0 if successful, error code if not. */
 /* On a successful return, the C file name is in the stream buffer. */

Modified: trunk/gs/src/zfproc.c
===================================================================
--- trunk/gs/src/zfproc.c	2006-07-12 21:30:00 UTC (rev 6912)
+++ trunk/gs/src/zfproc.c	2006-07-12 21:46:07 UTC (rev 6913)
@@ -183,7 +183,6 @@
 {
     int npush = nstate + 4;
     stream *ps;
-    stream *psstdin;
 
     switch (status) {
 	case INTC:
@@ -305,8 +304,6 @@
 			 const ref * pstate, int nstate, op_proc_t cont)
 {
     stream *ps;
-    stream *psstderr;
-    stream *psstdout;
     stream_proc_state *psst;
 
     switch (status) {

Modified: trunk/gs/src/ziodevsc.c
===================================================================
--- trunk/gs/src/ziodevsc.c	2006-07-12 21:30:00 UTC (rev 6912)
+++ trunk/gs/src/ziodevsc.c	2006-07-12 21:46:07 UTC (rev 6913)
@@ -16,6 +16,7 @@
 #include "stdio_.h"
 #include "ghost.h"
 #include "gpcheck.h"
+#include "gp.h"
 #include "oper.h"
 #include "stream.h"
 #include "gxiodev.h"		/* must come after stream.h */
@@ -66,21 +67,11 @@
  * According to Adobe, it is legal to close the %std... files and then
  * re-open them later.  However, the re-opened file object is not 'eq' to
  * the original file object (in our implementation, it has a different
- * read_id or write_id).
+ * read_id or write_id). This is performed in 'file_close_file' by the
+ * call to file_close_disable.
  */
 
 private int
-stdio_close(stream *s)
-{
-    int code = (*s->save_close)(s);
-    if (code)
-	return code;
-    /* Increment the IDs to prevent further access. */
-    s->read_id = s->write_id = (s->read_id | s->write_id) + 1;
-    return 0;
-}
-
-private int
     s_stdin_read_process(stream_state *, stream_cursor_read *,
 			 stream_cursor_write *, bool);
 
@@ -185,10 +176,6 @@
     return (s_is_valid(s) && s->procs.process == s_stdin_read_process);
 }
 
-private int
-    s_stdout_swrite_process(stream_state *, stream_cursor_read *,
-			 stream_cursor_write *, bool);
-
 /* Write a buffer to stdout, potentially writing to callback */
 private int
 s_stdout_write_process(stream_state * st, stream_cursor_read *pr,
@@ -260,10 +247,6 @@
     return min(code, 0);
 }
 
-private int
-    s_stderr_swrite_process(stream_state *, stream_cursor_read *,
-			 stream_cursor_write *, bool);
-
 /* Write a buffer to stderr, potentially writing to callback */
 private int
 s_stderr_write_process(stream_state * st, stream_cursor_read *pr,