supressing gcc warning

diff --git a/pgadmin/frm/frmImport.cpp b/pgadmin/frm/frmImport.cpp
index 702a6b52956c625f25afb67ac69e3b684233d27c..d27f17ca5eec6f57d2dada7cf1f94135eeda5ac9 100755 (executable)
--- a/pgadmin/frm/frmImport.cpp
+++ b/pgadmin/frm/frmImport.cpp
@@ -838,7 +838,8 @@ void frmImport::OnArchFilePathKillFocus(wxFocusEvent &ev)
 {\r
     if (txtArchFilePath->IsModified())\r
     {\r
-        OnArchFileChange(&txtArchFilePath->GetValue());\r
+        wxString archfilepath = txtArchFilePath->GetValue();\r
+        OnArchFileChange(&archfilepath);\r
         txtArchFilePath->SetModified(false);\r
     }\r
 }\r
@@ -1455,7 +1456,7 @@ void frmImport::ImportData()
     }\r
 \r
     bool logerror = chkLogError->GetValue();\r
-    bool logwarn = chkLogWarn->GetValue();\r
+    //bool logwarn = chkLogWarn->GetValue();\r
     bool logstmt = chkLogStmt->GetValue();\r
     bool loginfo = chkLogInfo->GetValue();\r
     bool logproc = chkLogInfo->GetValue();\r
@@ -1799,6 +1800,11 @@ void frmImport::ImportData()
         else\r
             imponlyrows = spinFileImpOnlyRows->GetValue();\r
     }\r
+    else\r
+    {\r
+        skipemptyline = false;\r
+        skipfirstrows = false;\r
+    }\r
 \r
     int commitevery = spinCommitEvery->GetValue();\r
     int stoponerror = spinStopOnError->GetValue();\r
@@ -1835,7 +1841,7 @@ void frmImport::ImportData()
     wxString impdatalist, insstmt, rowlog;\r
     wxChar imptranssn[32];\r
     bool copybolcking = false;\r
-    bool rowdataok;\r
+    bool rowdataisok;\r
     int commres;\r
 \r
     while (true)\r
@@ -2079,13 +2085,15 @@ void frmImport::ImportData()
         rowlog.Empty();\r
 \r
         if (m_datasrctype==TEXTFILEPAGE || m_datasrctype==ARCHFILEPAGE)\r
-            rowdataok = GenCSVSQLData(impdatalist, rowlog, linevals, valsnum, clienttime, impmode, fmtstyle);\r
+            rowdataisok = GenCSVSQLData(impdatalist, rowlog, linevals, valsnum, clienttime, impmode, fmtstyle);\r
 #if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
         else if (m_datasrctype==SRCODBCPAGE)\r
-            rowdataok = GenODBCSQLData(impdatalist, rowlog, odbcrowdata, clienttime, impmode);\r
+            rowdataisok = GenODBCSQLData(impdatalist, rowlog, odbcrowdata, clienttime, impmode);\r
 #endif\r
+        else\r
+            rowdataisok = false;\r
 \r
-        if (rowdataok)\r
+        if (rowdataisok)\r
         {\r
             if (impmode==IMPORTMODECOPY)\r
             {\r
@@ -3037,7 +3045,7 @@ bool frmImport::CheckWizardPage()
 \r
     bool isvalid = false;\r
 \r
-    int impdest;\r
+    int impdest = IMPDESTNONE;\r
     if (m_curpagenr==DESTLOGPAGE)\r
         impdest = (int)chcImpDest->GetClientData(chcImpDest->GetSelection());\r
 \r
@@ -3418,7 +3426,6 @@ void frmImport::GenColsPreview()
     bool rowhaserr, normtrans = true;\r
 \r
     m_datapverr = false;\r
-    int errcount = 0;\r
     size_t dbcolidx, pvgridrowidx = 0, pvgridcolidx, datpvrownr;\r
 \r
     wxDateTime clienttime;\r
@@ -3776,7 +3783,6 @@ void frmImport::GenColsPreview()
     {\r
         bool firstrowisheader = chkFileFirstRowIsHeader->GetValue();\r
         bool chktruefirst = chkFileCheckTrueFirst->GetValue();\r
-        bool skipemptyline = chkFileSkipEmptyRow->GetValue();\r
 \r
         datpvrownr = firstrowisheader?1:0;\r
 \r
@@ -4196,7 +4202,7 @@ bool frmImport::GenCSVSQLData(wxString& rowdatalist, wxString& rowlog, wxString*
     bool isfirstcol = true, haserror = false;\r
     wxDateTime tsfromval;\r
 \r
-    size_t dbcolidx, pvgridrowidx = 0, pvgridcolidx;\r
+    size_t dbcolidx, /*pvgridrowidx = 0, */pvgridcolidx;\r
 \r
     wxString curcdate = clienttime.FormatISODate();\r
     wxString curctime = clienttime.FormatISOTime();\r
@@ -4556,7 +4562,7 @@ bool frmImport::GenODBCSQLData(wxString& rowvals, wxString& rowlog, SQLWCHAR** o
     wxDateTime tsfromval;\r
     SQLSMALLINT odbccoltype;\r
 \r
-    size_t dbcolidx, pvgridrowidx = 0, pvgridcolidx;\r
+    size_t dbcolidx, pvgridcolidx;\r
 \r
     wxString curcdate = clienttime.FormatISODate();\r
     wxString curctime = clienttime.FormatISOTime();\r
@@ -5513,7 +5519,6 @@ void frmImport::ResetColSettingSrcColEditor(bool resetsrccol)
 #endif\r
     else\r
     {\r
-        bool firstish = chkFileFirstRowIsHeader->GetValue();\r
         for (rowidx=(size_t)0; rowidx<m_tgtcolsnum; rowidx++)\r
         {\r
             gridColSetting->SetCellEditor(rowidx, SRCCOLNAMENUM, new pgGridCellChioceEditor());\r
@@ -6188,7 +6193,7 @@ void frmImport::ParseColsImpSetting(int dbcolnr)
 \r
     bool isfirstcol = true, origcolerr;\r
     int wrncnt=0;\r
-    int origsrccolnr;\r
+    int origsrccolnr = wxNOT_FOUND;\r
 \r
 #if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     SQLSMALLINT stmtcolsnum, *stmttypes;\r
@@ -6824,7 +6829,6 @@ frmImport::exprSnippet *frmImport::ParseImportExpr(const wxString& origexpr)
     long colpos;\r
     wxString parsedsnip, colname;\r
     exprSnippet *exprsnip = NULL, *cursnip = NULL;\r
-    bool incoldef = false;\r
 \r
     while(exprdata[dataidx])\r
     {\r

diff --git a/pgadmin/utils/pgcsvfile.cpp b/pgadmin/utils/pgcsvfile.cpp
index 3212709979d6681e1c02f128fe828336e0bdcf27..f228a87d42daf508f04cbb4e9d72a9a2aa6db6fa 100755 (executable)
--- a/pgadmin/utils/pgcsvfile.cpp
+++ b/pgadmin/utils/pgcsvfile.cpp
@@ -1193,7 +1193,7 @@ wxFileOffset pgCSVFile::GenMoreFilePreview(wxString *pvstr)
         if (leftbyte)\r
             memcpy(readbuf+MAXWORDSZ-leftbyte, bufdata + m_pvdecoffset, leftbyte);\r
 \r
-        wxCSConv *txtconv;\r
+        wxCSConv *txtconv = NULL;\r
 #if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS && (wxUSE_ZIPSTREAM || wxUSE_TARSTREAM)\r
 #if wxUSE_ZIPSTREAM\r
         if (m_zipinstrm)\r
@@ -1483,7 +1483,7 @@ wxString **pgCSVFile::ParseLine(const wxChar *csvdata, size_t *parsedoffset, boo
     {\r
         *curcolnr = (size_t)0;\r
         parsedvals = new wxString *[m_widthdlmsnum];\r
-        memset(parsedvals, NULL, sizeof(parsedvals)*m_widthdlmsnum);\r
+        memset(parsedvals, 0, sizeof(parsedvals)*m_widthdlmsnum);\r
     }\r
 \r
     if (curval)\r