This commit was generated by cvs2svn to compensate for changes in r257,

which included commits to RCS files with non-trunk default branches.

git-svn-id: http://svn.ghostscript.com/ghostpcl/trunk/ghostpcl@258 06663e23-700e-0410-b217-a244a6096597

1 files changed, 114 insertions, 114 deletions

diff --git a/gs/src/seexec.c b/gs/src/seexec.c
index 176206868..4d47c815a 100644
--- a/gs/src/seexec.c
+++ b/gs/src/seexec.c
@@ -1,20 +1,20 @@
 /* Copyright (C) 1994, 1997 Aladdin Enterprises.  All rights reserved.
-  
-  This file is part of Aladdin Ghostscript.
-  
-  Aladdin Ghostscript is distributed with NO WARRANTY OF ANY KIND.  No author
-  or distributor accepts any responsibility for the consequences of using it,
-  or for whether it serves any particular purpose or works at all, unless he
-  or she says so in writing.  Refer to the Aladdin Ghostscript Free Public
-  License (the "License") for full details.
-  
-  Every copy of Aladdin Ghostscript must include a copy of the License,
-  normally in a plain ASCII text file named PUBLIC.  The License grants you
-  the right to copy, modify and redistribute Aladdin Ghostscript, but only
-  under certain conditions described in the License.  Among other things, the
-  License requires that the copyright notice and this notice be preserved on
-  all copies.
-*/
+
+   This file is part of Aladdin Ghostscript.
+
+   Aladdin Ghostscript is distributed with NO WARRANTY OF ANY KIND.  No author
+   or distributor accepts any responsibility for the consequences of using it,
+   or for whether it serves any particular purpose or works at all, unless he
+   or she says so in writing.  Refer to the Aladdin Ghostscript Free Public
+   License (the "License") for full details.
+
+   Every copy of Aladdin Ghostscript must include a copy of the License,
+   normally in a plain ASCII text file named PUBLIC.  The License grants you
+   the right to copy, modify and redistribute Aladdin Ghostscript, but only
+   under certain conditions described in the License.  Among other things, the
+   License requires that the copyright notice and this notice be preserved on
+   all copies.
+ */
 
 /* seexec.c */
 /* eexec filters */
@@ -36,29 +36,31 @@ private_st_exE_state();
 
 /* Process a buffer */
 private int
-s_exE_process(stream_state *st, stream_cursor_read *pr,
-  stream_cursor_write *pw, bool last)
-{	const byte *p = pr->ptr;
-	byte *q = pw->ptr;
-	uint rcount = pr->limit - p;
-	uint wcount = pw->limit - q;
-	uint count;
-	int status;
-	if ( rcount <= wcount )
-		count = rcount, status = 0;
-	else
-		count = wcount, status = 1;
-	gs_type1_encrypt(q + 1, p + 1, count, (crypt_state *)&ss->cstate);
-	pr->ptr += count;
-	pw->ptr += count;
-	return status;
+s_exE_process(stream_state * st, stream_cursor_read * pr,
+	      stream_cursor_write * pw, bool last)
+{
+    const byte *p = pr->ptr;
+    byte *q = pw->ptr;
+    uint rcount = pr->limit - p;
+    uint wcount = pw->limit - q;
+    uint count;
+    int status;
+
+    if (rcount <= wcount)
+	count = rcount, status = 0;
+    else
+	count = wcount, status = 1;
+    gs_type1_encrypt(q + 1, p + 1, count, (crypt_state *) & ss->cstate);
+    pr->ptr += count;
+    pw->ptr += count;
+    return status;
 }
 
 #undef ss
 
 /* Stream template */
 const stream_template s_exE_template =
-{	&st_exE_state, NULL, s_exE_process, 1, 2
+{&st_exE_state, NULL, s_exE_process, 1, 2
 };
 
 /* ------ eexecDecode ------ */
@@ -69,95 +71,93 @@ private_st_exD_state();
 
 /* Set defaults. */
 private void
-s_exD_set_defaults(stream_state *st)
-{	ss->lenIV = 4;
+s_exD_set_defaults(stream_state * st)
+{
+    ss->lenIV = 4;
 }
 
 /* Initialize the state for reading and decrypting. */
 /* Decrypting streams are not positionable. */
 private int
-s_exD_init(stream_state *st)
-{	ss->odd = -1;
-	ss->binary = -1;		/* unknown */
-	ss->record_left = max_long;
-	ss->skip = ss->lenIV;
-	return 0;
+s_exD_init(stream_state * st)
+{
+    ss->odd = -1;
+    ss->binary = -1;		/* unknown */
+    ss->record_left = max_long;
+    ss->skip = ss->lenIV;
+    return 0;
 }
 
 /* Process a buffer. */
 private int
-s_exD_process(stream_state *st, stream_cursor_read *pr,
-  stream_cursor_write *pw, bool last)
-{	register const byte *p = pr->ptr;
-	register byte *q = pw->ptr;
-	int skip = ss->skip;
-	int rcount = pr->limit - p;
-	int wcount = pw->limit - q;
-	int status = 0;
-	int count = (wcount < rcount ? (status = 1, wcount) : rcount);
-
-	if ( ss->binary < 0 )
-	{	/* This is the very first time we're filling the buffer. */
-		/* Determine whether this is ASCII or hex encoding. */
-		register const byte _ds *decoder = scan_char_decoder;
-		int i;
-
-		if ( rcount < 8 )
-			return 0;
-		/* Adobe's documentation doesn't actually specify the test */
-		/* that eexec should use, but we believe the following */
-		/* gives correct answers even on certain non-conforming */
-		/* PostScript files encountered in practice: */
-		ss->binary = 0;
-		for ( i = 1; i <= 8; i++ )
-		  if ( !(decoder[p[i]] <= 0xf ||
-			 decoder[p[i]] == ctype_space)
-		     )
-		    {	ss->binary = 1;
-			if ( ss->pfb_state != 0 )
-			  {	/* Stop at the end of the .PFB binary data. */
-				ss->record_left = ss->pfb_state->record_left;
-			  }
-			break;
-		  }
-	}
-	if ( ss->binary )
-	{	if ( count > ss->record_left )
-		  {	count = ss->record_left;
-			status = 0;
-		  }
-		/* We pause at the end of the .PFB binary data, */
-		/* in an attempt to keep from reading beyond the end of */
-		/* the encrypted data. */
-		if ( (ss->record_left -= count) == 0 )
-		  ss->record_left = max_long;
-		pr->ptr = p + count;
-	}
-	else
-	{	/* We only ignore leading whitespace, in an attempt to */
-		/* keep from reading beyond the end of the encrypted data. */
-		status = s_hex_process(pr, pw, &ss->odd,
-				       hex_ignore_leading_whitespace);
-		p = q;
-		count = pw->ptr - q;
-	}
-	if ( skip >= count && skip != 0 )
-	{	gs_type1_decrypt(q + 1, p + 1, count,
-				 (crypt_state *)&ss->cstate);
-		ss->skip -= count;
-		count = 0;
-		status = 0;
-	}
-	else
-	{	gs_type1_decrypt(q + 1, p + 1, skip,
-				 (crypt_state *)&ss->cstate);
-		count -= skip;
-		gs_type1_decrypt(q + 1, p + 1 + skip, count,
-				 (crypt_state *)&ss->cstate);
-		ss->skip = 0;
+s_exD_process(stream_state * st, stream_cursor_read * pr,
+	      stream_cursor_write * pw, bool last)
+{
+    register const byte *p = pr->ptr;
+    register byte *q = pw->ptr;
+    int skip = ss->skip;
+    int rcount = pr->limit - p;
+    int wcount = pw->limit - q;
+    int status = 0;
+    int count = (wcount < rcount ? (status = 1, wcount) : rcount);
+
+    if (ss->binary < 0) {	/* This is the very first time we're filling the buffer. */
+	/* Determine whether this is ASCII or hex encoding. */
+	register const byte _ds *decoder = scan_char_decoder;
+	int i;
+
+	if (rcount < 8)
+	    return 0;
+	/* Adobe's documentation doesn't actually specify the test */
+	/* that eexec should use, but we believe the following */
+	/* gives correct answers even on certain non-conforming */
+	/* PostScript files encountered in practice: */
+	ss->binary = 0;
+	for (i = 1; i <= 8; i++)
+	    if (!(decoder[p[i]] <= 0xf ||
+		  decoder[p[i]] == ctype_space)
+		) {
+		ss->binary = 1;
+		if (ss->pfb_state != 0) {	/* Stop at the end of the .PFB binary data. */
+		    ss->record_left = ss->pfb_state->record_left;
+		}
+		break;
+	    }
+    }
+    if (ss->binary) {
+	if (count > ss->record_left) {
+	    count = ss->record_left;
+	    status = 0;
 	}
-	pw->ptr = q + count;
-	return status;
+	/* We pause at the end of the .PFB binary data, */
+	/* in an attempt to keep from reading beyond the end of */
+	/* the encrypted data. */
+	if ((ss->record_left -= count) == 0)
+	    ss->record_left = max_long;
+	pr->ptr = p + count;
+    } else {			/* We only ignore leading whitespace, in an attempt to */
+	/* keep from reading beyond the end of the encrypted data. */
+	status = s_hex_process(pr, pw, &ss->odd,
+			       hex_ignore_leading_whitespace);
+	p = q;
+	count = pw->ptr - q;
+    }
+    if (skip >= count && skip != 0) {
+	gs_type1_decrypt(q + 1, p + 1, count,
+			 (crypt_state *) & ss->cstate);
+	ss->skip -= count;
+	count = 0;
+	status = 0;
+    } else {
+	gs_type1_decrypt(q + 1, p + 1, skip,
+			 (crypt_state *) & ss->cstate);
+	count -= skip;
+	gs_type1_decrypt(q + 1, p + 1 + skip, count,
+			 (crypt_state *) & ss->cstate);
+	ss->skip = 0;
+    }
+    pw->ptr = q + count;
+    return status;
 }
 
 #undef ss
@@ -172,6 +172,6 @@ s_exD_process(stream_state *st, stream_cursor_read *pr,
  * a size of at least 128 so that filter_read won't round it up.
  */
 const stream_template s_exD_template =
-{	&st_exD_state, s_exD_init, s_exD_process, 8, 200,
-	NULL, s_exD_set_defaults
+{&st_exD_state, s_exD_init, s_exD_process, 8, 200,
+ NULL, s_exD_set_defaults
 };