[Python-checkins] CVS: python/dist/src/Parser parsetok.c,2.28,2.28.8.1

[Martin v. L?wis]

Update of /cvsroot/python/python/dist/src/Parser
In directory usw-pr-cvs1:/tmp/cvs-serv24647/Parser

Modified Files:
      Tag: release22-maint
	parsetok.c 
Log Message:
Initialize err_ret with filename if available. Fixes #498828.


Index: parsetok.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/parsetok.c,v
retrieving revision 2.28
retrieving revision 2.28.8.1
diff -C2 -d -r2.28 -r2.28.8.1
*** parsetok.c	2001/10/20 14:27:56	2.28
--- parsetok.c	2002/01/05 21:41:01	2.28.8.1
***************
*** 15,19 ****
  /* Forward */
  static node *parsetok(struct tok_state *, grammar *, int, perrdetail *, int);
! static void initerr(perrdetail *err_ret);
  
  /* Parse input coming from a string.  Return error code, print some errors. */
--- 15,19 ----
  /* Forward */
  static node *parsetok(struct tok_state *, grammar *, int, perrdetail *, int);
! static void initerr(perrdetail *err_ret, char* filename);
  
  /* Parse input coming from a string.  Return error code, print some errors. */
***************
*** 30,34 ****
  	struct tok_state *tok;
  
! 	initerr(err_ret);
  
  	if ((tok = PyTokenizer_FromString(s)) == NULL) {
--- 30,34 ----
  	struct tok_state *tok;
  
! 	initerr(err_ret, NULL);
  
  	if ((tok = PyTokenizer_FromString(s)) == NULL) {
***************
*** 64,68 ****
  	struct tok_state *tok;
  
! 	initerr(err_ret);
  
  	if ((tok = PyTokenizer_FromFile(fp, ps1, ps2)) == NULL) {
--- 64,68 ----
  	struct tok_state *tok;
  
! 	initerr(err_ret, filename);
  
  	if ((tok = PyTokenizer_FromFile(fp, ps1, ps2)) == NULL) {
***************
*** 179,186 ****
  
  static void
! initerr(perrdetail *err_ret)
  {
  	err_ret->error = E_OK;
! 	err_ret->filename = NULL;
  	err_ret->lineno = 0;
  	err_ret->offset = 0;
--- 179,186 ----
  
  static void
! initerr(perrdetail *err_ret, char* filename)
  {
  	err_ret->error = E_OK;
! 	err_ret->filename = filename;
  	err_ret->lineno = 0;
  	err_ret->offset = 0;