Skip to content

Commit ea0a549

Browse files
noguchi-kadamjstewart
authored andcommitted
pcma: set return value and change return type of function (spack#14579)
1 parent 492b600 commit ea0a549

File tree

2 files changed

+45
-0
lines changed

2 files changed

+45
-0
lines changed
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
diff -ur spack-src.org/alcomp2.c spack-src/alcomp2.c
2+
--- spack-src.org/alcomp2.c 2020-01-21 15:13:59.483665899 +0900
3+
+++ spack-src/alcomp2.c 2020-01-21 15:15:25.702732353 +0900
4+
@@ -155,7 +155,7 @@
5+
int *ScoreOverColumn (int colScore, int flag1, int flag2, int flag3, int flag4, int flag5, int flag6, int *column_Score);
6+
7+
void *ReadRef (char *inputfile);
8+
-int CompareAlnVsReferenceAln (int *apos1, int *apos2, int *aposref1, int *aposref2, int start_ref1, int start_ref2, int end_ref1, int end_ref2 /* , int coverage1, int coverage2, int accuracy1, int accuracy2*/ );
9+
+void CompareAlnVsReferenceAln (int *apos1, int *apos2, int *aposref1, int *aposref2, int start_ref1, int start_ref2, int end_ref1, int end_ref2 /* , int coverage1, int coverage2, int accuracy1, int accuracy2*/ );
10+
11+
double p_dayhoff[]={0, 0.0143859, 0.0384319, 0.0352742, 0.0195027, 0.086209, 0.048466, 0.0708956, 0.0866279, 0.0193078,
12+
0.0832518, 0.0457631, 0.0610127, 0.0695179, 0.0390894, 0.0367281, 0.0570451, 0.0580589, 0.0244313, 0.043972, 0.0620286};
13+
@@ -1738,7 +1738,7 @@
14+
int **ali;
15+
readali(filename);
16+
17+
-if (flag_errread==1) return;
18+
+if (flag_errread==1) return NULL;
19+
20+
ali=ali_char2int(aseq,start_num,start_seq);
21+
return ali;
22+
@@ -3247,7 +3247,7 @@
23+
reflen_nogp = pos;
24+
}
25+
26+
-int CompareAlnVsReferenceAln (int *apos1, int *apos2, int *aposref1, int *aposref2, int start_ref1, int start_ref2, int end_ref1, int end_ref2 /*, int coverage1, int coverage2, int accuracy1, int accuracy2 */)
27+
+void CompareAlnVsReferenceAln (int *apos1, int *apos2, int *aposref1, int *aposref2, int start_ref1, int start_ref2, int end_ref1, int end_ref2 /*, int coverage1, int coverage2, int accuracy1, int accuracy2 */)
28+
{
29+
int i,j,k;
30+
int start_ali1, start_ali2, end_ali1, end_ali2;
31+
diff -ur spack-src.org/interface.c spack-src/interface.c
32+
--- spack-src.org/interface.c 2020-01-21 15:13:59.483665899 +0900
33+
+++ spack-src/interface.c 2020-01-21 15:14:23.466183088 +0900
34+
@@ -202,7 +202,7 @@
35+
match[i] = 0;
36+
}
37+
38+
- if(args[0]==NULL) return;
39+
+ if(args[0]==NULL) return 0;
40+
41+
params[0]=(char *)ckalloc((strlen(args[0])+1)*sizeof(char));
42+
if (args[0][0]!=COMMANDSEP)

var/spack/repos/builtin/packages/pcma/package.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ def edit(self, spec, prefix):
2222
def install(self, spec, prefix):
2323
mkdirp(prefix.bin)
2424
install('pcma', prefix.bin)
25+
26+
# set return value and change return type of function [-Wreturn-type]
27+
patch('fix_return_type_err.patch')

0 commit comments

Comments
 (0)