Changeset 6141 for trunk/AWTI/AWTI_import.cxx
- Timestamp:
- 14/08/09 16:29:27 (3 years ago)
- Files:
-
- 1 modified
-
trunk/AWTI/AWTI_import.cxx (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/AWTI/AWTI_import.cxx
r6101 r6141 25 25 26 26 static char *awtc_fgets(char *s, int size, FILE *stream) { 27 // same as fgets but also works with file in M ACOS format27 // same as fgets but also works with file in MacOS format 28 28 int i; 29 29 for (i = 0; i<(size-1); ++i) { … … 44 44 bool awtc_read_string_pair(FILE *in, char *&s1, char *&s2, size_t& lineNr) { 45 45 // helper function to read import/export filters. 46 // returns true if suc essfully read46 // returns true if successfully read 47 47 // 48 48 // 's1' is set to a heap-copy of the first token on line … … 519 519 char *awtc_read_line(int tab,char *sequencestart, char *sequenceend){ 520 520 /* two modes: tab == 0 -> read single lines, 521 different files are sep erated by sequenceend,521 different files are separated by sequenceend, 522 522 tab != 0 join lines that start after position tab, 523 joined lines are sep erated by '|'523 joined lines are separated by '|' 524 524 except lines that match sequencestart 525 525 (they may be part of sequence if read_this_sequence_line_too = 1 */ … … 528 528 static int b2offset = 0; 529 529 const int BUFSIZE = 8000; 530 const char *SEP ERATOR = "|"; // line seperator530 const char *SEPARATOR = "|"; // line separator 531 531 struct input_format_struct *ifo; 532 532 ifo = awtcig.ifo; … … 602 602 return ifo->b2; 603 603 } 604 strncpy(ifo->b2+b2offset, SEP ERATOR, BUFSIZE - 4- b2offset);604 strncpy(ifo->b2+b2offset, SEPARATOR, BUFSIZE - 4- b2offset); 605 605 b2offset += strlen(ifo->b2+b2offset); 606 606
