[Python-checkins] python/nondist/sandbox/csv _csv.c,1.32,1.33

davecole@users.sourceforge.net davecole@users.sourceforge.net
Sun, 16 Feb 2003 03:05:02 -0800


Update of /cvsroot/python/python/nondist/sandbox/csv
In directory sc8-pr-cvs1:/tmp/cvs-serv19742

Modified Files:
	_csv.c 
Log Message:
Use '\n' to signal end of line, not '\0' (idiot).


Index: _csv.c
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/csv/_csv.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** _csv.c	15 Feb 2003 00:52:59 -0000	1.32
--- _csv.c	16 Feb 2003 11:04:58 -0000	1.33
***************
*** 464,468 ****
  	case START_RECORD:
  		/* start of record */
! 		if (c == '\0')
  			/* empty line - return [] */
  			break;
--- 464,468 ----
  	case START_RECORD:
  		/* start of record */
! 		if (c == '\n')
  			/* empty line - return [] */
  			break;
***************
*** 472,476 ****
  	case START_FIELD:
  		/* expecting field */
! 		if (c == '\0') {
  			/* save empty field - return [fields] */
  			parse_save_field(self);
--- 472,476 ----
  	case START_FIELD:
  		/* expecting field */
! 		if (c == '\n') {
  			/* save empty field - return [fields] */
  			parse_save_field(self);
***************
*** 510,514 ****
  	case IN_FIELD:
  		/* in unquoted field */
! 		if (c == '\0') {
  			/* end of line - return [fields] */
  			parse_save_field(self);
--- 510,514 ----
  	case IN_FIELD:
  		/* in unquoted field */
! 		if (c == '\n') {
  			/* end of line - return [fields] */
  			parse_save_field(self);
***************
*** 532,536 ****
  	case IN_QUOTED_FIELD:
  		/* in quoted field */
! 		if (c == '\0') {
  			/* end of line - save '\n' in field */
  			parse_add_char(self, '\n');
--- 532,536 ----
  	case IN_QUOTED_FIELD:
  		/* in quoted field */
! 		if (c == '\n') {
  			/* end of line - save '\n' in field */
  			parse_add_char(self, '\n');
***************
*** 578,582 ****
  			self->state = START_FIELD;
  		}
! 		else if (c == '\0') {
  			/* end of line - return [fields] */
  			parse_save_field(self);
--- 578,582 ----
  			self->state = START_FIELD;
  		}
! 		else if (c == '\n') {
  			/* end of line - return [fields] */
  			parse_save_field(self);
***************
*** 655,659 ****
  		}
  
!                 /* Process line of text - send '\0' to processing code to
                  represent end of line.  End of line which is not at end of
                  string is an error. */
--- 655,659 ----
  		}
  
!                 /* Process line of text - send '\n' to processing code to
                  represent end of line.  End of line which is not at end of
                  string is an error. */
***************
*** 694,698 ****
                          }
                  }
!                 parse_process_char(self, '\0');
                  Py_DECREF(lineobj);
          } while (self->state != START_RECORD);
--- 694,698 ----
                          }
                  }
!                 parse_process_char(self, '\n');
                  Py_DECREF(lineobj);
          } while (self->state != START_RECORD);