Skip to content

Bug fix in fasta2* with very large reads (> 2Gb) #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
a-ludi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bug fix in fasta2* with very large reads (> 2Gb) #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions fasta2DAM.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ int main(int argc, char *argv[])

{ int maxlen;
int64 totlen, count[4];
int rmax;
int64 rmax;
DAZZ_READ prec;
char *read;
int append;
Expand Down Expand Up @@ -426,7 +426,7 @@ int main(int argc, char *argv[])
fprintf(stderr,"Adding '%s.fasta' ...\n",core);
fflush(stderr);
}

if (!append)
flist[ofiles++] = core;

Expand Down Expand Up @@ -467,7 +467,7 @@ int main(int argc, char *argv[])
break;
rlen += x;
if (rlen + MAX_NAME > rmax)
{ rmax = ((int) (1.2 * rmax)) + 1000 + MAX_NAME;
{ rmax = ((int64) (1.2 * rmax)) + 1000 + MAX_NAME;
read = (char *) realloc(read,rmax+1);
if (read == NULL)
{ fprintf(stderr,"File %s.fasta, Line %d:",core,nline);
Expand Down
8 changes: 4 additions & 4 deletions fasta2DB.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ int main(int argc, char *argv[])
exit (1);
}

if ( (IFILE == NULL && PIPE == NULL && argc <= 2) ||
if ( (IFILE == NULL && PIPE == NULL && argc <= 2) ||
((IFILE != NULL || PIPE != NULL) && argc != 2))
{ fprintf(stderr,"Usage: %s %s\n",Prog_Name,Usage);
fprintf(stderr,"\n");
Expand Down Expand Up @@ -323,7 +323,7 @@ int main(int argc, char *argv[])

{ int maxlen;
int64 totlen, count[4];
int pmax, rmax;
int64 pmax, rmax;
DAZZ_READ *prec;
char *read;
int c;
Expand Down Expand Up @@ -410,7 +410,7 @@ int main(int argc, char *argv[])

{ int j;


if (PIPE == NULL || (strcmp(core,"stdout") != 0 &&
(ofiles == 0 || strcmp(core,flist[ofiles-1]) != 0)))
for (j = 0; j < ofiles; j++)
Expand Down Expand Up @@ -514,7 +514,7 @@ int main(int argc, char *argv[])
break;
rlen += x;
if (rlen + MAX_NAME > rmax)
{ rmax = ((int) (1.2 * rmax)) + 1000 + MAX_NAME;
{ rmax = ((int64) (1.2 * rmax)) + 1000 + MAX_NAME;
read = (char *) realloc(read,rmax+1);
if (read == NULL)
{ fprintf(stderr,"File %s.fasta, Line %d:",core,nline);
Expand Down