obitools/obitools3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 66 Wiki Activity

Fixed gcc warnings

Browse Source
This commit is contained in:
Celine Mercier
2019-09-25 11:38:00 +02:00
parent c3b9e46291
commit 44517db51f
11 changed files with 49 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/obi_ecopcr.c
View File

@ -357,7 +357,7 @@ static int print_seq(Obiview_p i_view, Obiview_p o_view,
char* amplicon = NULL;
double tm1,tm2;
double tm=0;
//double tm=0;
int32_t i;
@ -424,8 +424,8 @@ static int print_seq(Obiview_p i_view, Obiview_p o_view,
amplicon[amplicon_len] = 0;
}
tm1=nparam_CalcTwoTM(tparm,oligo1,primer1,o1->patlen) - 273.15;
tm2=nparam_CalcTwoTM(tparm,oligo2,primer2,o2->patlen) - 273.15;
tm1=nparam_CalcTwoTM(tparm, oligo1, primer1, o1->patlen) - 273.15;
tm2=nparam_CalcTwoTM(tparm, oligo2, primer2, o2->patlen) - 273.15;
//tm = (tm1 < tm2) ? tm1:tm2;
if (isnan(tm1))
@ -674,32 +674,28 @@ int obi_ecopcr(const char* i_dms_name,
PatternPtr o1c;
PatternPtr o2c;
double tm,tm1,tm2;
OBIDMS_p i_dms;
OBIDMS_p o_dms;
OBIDMS_taxonomy_p taxonomy;
OBIDMS_p i_dms = NULL;
OBIDMS_p o_dms = NULL;
OBIDMS_taxonomy_p taxonomy = NULL;
Obiview_p i_view = NULL;
Obiview_p o_view = NULL;
OBIDMS_column_p i_seq_column, i_taxid_column, \
i_id_column, o_id_column, \
o_ori_seq_len_column, o_amplicon_column, o_amplicon_length_column, \
o_taxid_column, o_rank_column, o_name_column, \
o_species_taxid_column, o_species_name_column, \
o_genus_taxid_column, o_genus_name_column, \
o_family_taxid_column, o_family_name_column, \
o_kingdom_taxid_column, o_kingdom_name_column, \
o_superkingdom_taxid_column, o_superkingdom_name_column, \
o_strand_column, \
o_primer1_column, o_primer2_column, \
o_error1_column, o_error2_column, \
o_temp1_column, o_temp2_column = NULL;
OBIDMS_column_p i_seq_column = NULL, i_taxid_column = NULL, \
i_id_column = NULL, o_id_column = NULL, \
o_ori_seq_len_column = NULL, o_amplicon_column = NULL, o_amplicon_length_column = NULL, \
o_taxid_column = NULL, o_rank_column = NULL, o_name_column = NULL, \
o_species_taxid_column = NULL, o_species_name_column = NULL, \
o_genus_taxid_column = NULL, o_genus_name_column = NULL, \
o_family_taxid_column = NULL, o_family_name_column = NULL, \
o_kingdom_taxid_column = NULL, o_kingdom_name_column = NULL, \
o_superkingdom_taxid_column = NULL, o_superkingdom_name_column = NULL, \
o_strand_column = NULL, \
o_primer1_column = NULL, o_primer2_column = NULL, \
o_error1_column = NULL, o_error2_column = NULL, \
o_temp1_column = NULL, o_temp2_column = NULL;
index_t seq_count;
index_t checkedSequence = 0;
index_t positiveSequence = 0;
index_t ampliconCount = 0;
obiint_t taxid;
char* sequence;
@ -747,10 +743,6 @@ int obi_ecopcr(const char* i_dms_name,
o1c = complementPattern(o1);
o2c = complementPattern(o2);
tm1 = nparam_CalcSelfTM(&tparm,o1->cpat,o1->patlen) - 273.15;
tm2 = nparam_CalcSelfTM(&tparm,o2->cpat,o2->patlen) - 273.15;
tm = (tm1 < tm2) ? tm1:tm2;
// Open input DMS
i_dms = obi_open_dms(i_dms_name, false);
if (i_dms == NULL)
@ -976,8 +968,6 @@ int obi_ecopcr(const char* i_dms_name,
}
checkedSequence = 0;
positiveSequence= 0;
ampliconCount = 0;
seq_count = (i_view->infos)->line_count;