Fix warnings.

5 files changed, 51 insertions, 44 deletions

diff --git a/mgizapp/src/cmd.c b/mgizapp/src/cmd.c
index 323b5a9..8847172 100644
--- a/mgizapp/src/cmd.c
+++ b/mgizapp/src/cmd.c
@@ -1,6 +1,7 @@
 
 // $Id: cmd.c 1307 2007-03-14 22:22:36Z hieuhoang1972 $
 
+#include	<stdarg.h>
 #include	<stdio.h>
 #include	<stdlib.h>
 #include	<ctype.h>
@@ -52,19 +53,7 @@ static int	Scan(),
 static Cmd_T	cmds[MAXPARAM+1];
 static char	*SepString = " \t\n";
 
-#if defined(__STDC__)
-#include	<stdarg.h>
-int DeclareParams(char *ParName, ...)
-#else
-#ifdef WIN32
-int DeclareParams(char *ParName, ...)
-#else
-#include	<varargs.h>
-int DeclareParams(ParName, va_alist)
-char	*ParName;
-va_dcl
-#endif
-#endif
+int DeclareParams(const char *ParName, ...)
 {
 	va_list		args;
 	static int	ParamN = 0;
@@ -72,11 +61,7 @@ va_dcl
 			c;
 	char		*s;
 
-#if defined(__STDC__) || defined (WIN32)
 	va_start(args, ParName);
-#else
-	va_start(args);
-#endif
 	for(;ParName;) {
 		if(ParamN==MAXPARAM) {
 			fprintf(stderr, "Too many parameters !!\n");
diff --git a/mgizapp/src/cmd.h b/mgizapp/src/cmd.h
index a314f41..2e61bba 100644
--- a/mgizapp/src/cmd.h
+++ b/mgizapp/src/cmd.h
@@ -33,7 +33,7 @@ extern "C" {
 #endif
 
 #if defined(__STDC__)  || defined(WIN32)
-int DeclareParams(char *, ...);
+int DeclareParams(const char *, ...);
 #else
 
 int DeclareParams();
diff --git a/mgizapp/src/model1.cpp b/mgizapp/src/model1.cpp
index 40632c2..9b71d8f 100644
--- a/mgizapp/src/model1.cpp
+++ b/mgizapp/src/model1.cpp
@@ -32,12 +32,18 @@ extern short NCPUS;
 GLOBAL_PARAMETER2(int,Model1_Dump_Freq,"MODEL 1 DUMP FREQUENCY","t1","dump frequency of Model 1",PARLEV_OUTPUT,0);
 int NumberOfVALIalignments=100;
 
-model1::model1(const char* efname, vcbList& evcblist, vcbList& fvcblist,tmodel<COUNT, PROB>&_tTable,Perplexity& _perp,
-	      sentenceHandler& _sHandler1,
-	      Perplexity* _testPerp,
-	      sentenceHandler* _testHandler,
-	      Perplexity& _trainViterbiPerp,
-	      Perplexity* _testViterbiPerp):
+model1::model1(
+    const char* efname,
+    vcbList& evcblist,
+    vcbList& fvcblist,
+    tmodel<COUNT, PROB> &_tTable,
+    Perplexity & _perp,
+    sentenceHandler& _sHandler1,
+    Perplexity* _testPerp,
+    sentenceHandler* _testHandler,
+    Perplexity& _trainViterbiPerp,
+    Perplexity* _testViterbiPerp)
+    :
   report_info(_perp,_sHandler1,_testPerp,_testHandler,_trainViterbiPerp,_testViterbiPerp),
   efFilename(efname), Elist(evcblist), Flist(fvcblist), 
   eTotalWCount(Elist.totalVocab()), fTotalWCount(Flist.totalVocab()), 
@@ -45,11 +51,18 @@ model1::model1(const char* efname, vcbList& evcblist, vcbList& fvcblist,tmodel<C
   evlist(Elist.getVocabList()), fvlist(Flist.getVocabList())
 {}
 
-model1::model1 (const model1& m1, int _threadID):
-report_info(m1),efFilename(m1.efFilename),
-Elist(m1.Elist),Flist(m1.Flist),eTotalWCount(m1.eTotalWCount),fTotalWCount(m1.fTotalWCount),
-noEnglishWords(m1.noEnglishWords),noFrenchWords(m1.noFrenchWords),tTable(m1.tTable),
-evlist(m1.evlist),fvlist(m1.fvlist)
+model1::model1(const model1& m1, int _threadID) :
+  report_info(m1),
+  efFilename(m1.efFilename),
+  Elist(m1.Elist),
+  Flist(m1.Flist),
+  eTotalWCount(m1.eTotalWCount),
+  fTotalWCount(m1.fTotalWCount),
+  noEnglishWords(m1.noEnglishWords),
+  noFrenchWords(m1.noFrenchWords),
+  tTable(m1.tTable),
+  evlist(m1.evlist),
+  fvlist(m1.fvlist)
 {}
 
 void model1::initialize_table_uniformly(sentenceHandler& sHandler1){
diff --git a/mgizapp/src/model1.h b/mgizapp/src/model1.h
index fc4ee88..142ca4f 100644
--- a/mgizapp/src/model1.h
+++ b/mgizapp/src/model1.h
@@ -71,13 +71,22 @@ class report_info{
 	      sentenceHandler* _testHandler,
 	      Perplexity& _trainViterbiPerp,
 	      Perplexity* _testViterbiPerp)
-    : perp(_perp),sHandler1(_sHandler1),testPerp(_testPerp),testHandler(_testHandler),trainViterbiPerp(_trainViterbiPerp),testViterbiPerp(_testViterbiPerp)
+    :
+        perp(_perp),
+        sHandler1(_sHandler1),
+        testPerp(_testPerp),
+        testHandler(_testHandler),
+        trainViterbiPerp(_trainViterbiPerp),
+        testViterbiPerp(_testViterbiPerp)
     {}
     
-    report_info(const report_info & rp):
-        perp(rp.perp),sHandler1(rp.sHandler1), testPerp(rp.testPerp),
-        trainViterbiPerp(rp.trainViterbiPerp), testViterbiPerp(rp.testViterbiPerp),
-        testHandler(rp.testHandler)
+    report_info(const report_info &rp) :
+        perp(rp.perp),
+        sHandler1(rp.sHandler1),
+        testPerp(rp.testPerp),
+        testHandler(rp.testHandler),
+        trainViterbiPerp(rp.trainViterbiPerp),
+        testViterbiPerp(rp.testViterbiPerp)
     {}
 };
 
diff --git a/mgizapp/src/symal.cpp b/mgizapp/src/symal.cpp
index 5767859..e39200e 100644
--- a/mgizapp/src/symal.cpp
+++ b/mgizapp/src/symal.cpp
@@ -227,7 +227,7 @@ int printsrctotgt(fstream& out,int m,int *a,int n,int* b){
 //to represent the grow alignment as the unionalignment of a
 //directed and inverted alignment
 
-int printgrow(fstream& out,int m,int *a,int n,int* b, bool diagonal=false,bool final=false,bool bothuncovered=false){
+int printgrow(fstream& out,int m,int *a,int n,int* b, bool diagonal=false,bool isfinal=false,bool bothuncovered=false){
    
    ostringstream sout;
    
@@ -321,7 +321,7 @@ int printgrow(fstream& out,int m,int *a,int n,int* b, bool diagonal=false,bool f
       }
    }
       
-      if (final){
+      if (isfinal){
          for (k=unionalignment.begin();k!=unionalignment.end();k++)
             if (A[k->first][k->second]==1)
             {            
@@ -390,10 +390,10 @@ int printgrow(fstream& out,int m,int *a,int n,int* b, bool diagonal=false,bool f
 int main(int argc, char** argv){
 	
 int alignment=0;   
-char* input="/dev/stdin";
-char* output="/dev/stdout";
+const char* input="/dev/stdin";
+const char* output="/dev/stdout";
 int diagonal=false;
-int final=false;
+int isfinal=false;
 int bothuncovered=false;
 
 	
@@ -401,8 +401,8 @@ int bothuncovered=false;
                  "alignment", CMDENUMTYPE,  &alignment, AlignEnum,
                  "d", CMDENUMTYPE,  &diagonal, BoolEnum,
                  "diagonal", CMDENUMTYPE,  &diagonal, BoolEnum,
-                 "f", CMDENUMTYPE,  &final, BoolEnum,
-                 "final", CMDENUMTYPE,  &final, BoolEnum,
+                 "f", CMDENUMTYPE,  &isfinal, BoolEnum,
+                 "final", CMDENUMTYPE,  &isfinal, BoolEnum,
                  "b", CMDENUMTYPE,  &bothuncovered, BoolEnum,  
                  "both", CMDENUMTYPE,  &bothuncovered, BoolEnum,  
                  "i", CMDSTRINGTYPE, &input,
@@ -410,7 +410,7 @@ int bothuncovered=false;
                  "v", CMDENUMTYPE,  &verbose, BoolEnum,
                  "verbose", CMDENUMTYPE,  &verbose, BoolEnum,
 
-                 (char *)NULL);
+                 NULL);
   
 	GetParams(&argc, &argv, (char*) NULL);
    
@@ -464,11 +464,11 @@ int bothuncovered=false;
 			break;
       case GROW:
      cerr << "symal: computing grow alignment: diagonal ("
-         << diagonal << ") final ("<< final << ")" 
+         << diagonal << ") final ("<< isfinal << ")" 
          <<  "both-uncovered (" << bothuncovered <<")\n"; 
          
          while(getals(inp,m,a,n,b,out)) 
-               printgrow(out,m,a,n,b,diagonal,final,bothuncovered);
+               printgrow(out,m,a,n,b,diagonal,isfinal,bothuncovered);
          
          break;
       case TGTTOSRC: