diff --git a/utils/tex2rtf/src/htmlutil.cpp b/utils/tex2rtf/src/htmlutil.cpp index 1029c30603..16a26b4135 100644 --- a/utils/tex2rtf/src/htmlutil.cpp +++ b/utils/tex2rtf/src/htmlutil.cpp @@ -2523,7 +2523,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start) if (val) { bool isPicture = FALSE; - char *s = ParseColourString(val, &isPicture); + ParseColourString(val, &isPicture); if (isPicture) { if (backgroundImageString) @@ -2662,7 +2662,6 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start) startRows = TRUE; tableVerticalLineLeft = FALSE; tableVerticalLineRight = FALSE; - int currentWidth = 0; char *alignString = copystring(GetArgData()); ParseTableArgument(alignString); diff --git a/utils/tex2rtf/src/rtfutils.cpp b/utils/tex2rtf/src/rtfutils.cpp index e4e08c30bb..1fab27399e 100644 --- a/utils/tex2rtf/src/rtfutils.cpp +++ b/utils/tex2rtf/src/rtfutils.cpp @@ -243,7 +243,6 @@ void WriteWinHelpContentsFileLine(char *topicName, char *xitle, int level) char ch1=xitle[s+1]&0xff; char ch2=xitle[s+2]&0xff; char ch3=xitle[s+3]&0xff; - char ch4=xitle[s+4]&0xff; s+=4; // next character char a=0; if ((ch1==0x27)&&(ch2==0x66)&&(ch3==0x36)) { title[d++]='ö'; a=1; } @@ -3366,7 +3365,6 @@ bool RTFOnArgument(int macroId, int arg_no, bool start) { if (useWord) { - char *s = GetArgData(); TexOutput("p. "); TexOutput("{\\field{\\*\\fldinst PAGEREF "); TexOutput(refName); @@ -3618,7 +3616,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start) } else { - sprintf(buf, "Could not read metafile %s. Perhaps it's not a placeable metafile?", f); + sprintf(buf, "Could not read metafile %s. Perhaps it's not a placeable metafile?", (const char*)f); OnError(buf); } fclose(fd); diff --git a/utils/tex2rtf/src/tex2rtf.cpp b/utils/tex2rtf/src/tex2rtf.cpp index 281acafa0c..c7fa8f6a7b 100644 --- a/utils/tex2rtf/src/tex2rtf.cpp +++ b/utils/tex2rtf/src/tex2rtf.cpp @@ -58,7 +58,7 @@ char *contentsString = NULL; bool suppressNameDecoration = FALSE; bool OkToClose = TRUE; int passNumber = 1; -int errorCount = 0; +unsigned long errorCount = 0UL; #ifndef NO_GUI @@ -432,7 +432,7 @@ bool MyApp::OnInit() #ifdef NO_GUI return 0; #else - return NULL; + return FALSE; #endif } @@ -440,7 +440,7 @@ bool MyApp::OnInit() // Return the main frame window return TRUE; #else - return FALSE; + return 0; #endif } @@ -1208,7 +1208,6 @@ bool SplitCommand(char *data, char *firstArg, char *secondArg) firstArg[0] = 0; secondArg[0] = 0; int i = 0; - int len = strlen(data); bool stop = FALSE; // Find first argument (command name) while (!stop) diff --git a/utils/tex2rtf/src/texutils.cpp b/utils/tex2rtf/src/texutils.cpp index be0c83a28c..746255c5f7 100644 --- a/utils/tex2rtf/src/texutils.cpp +++ b/utils/tex2rtf/src/texutils.cpp @@ -1687,7 +1687,7 @@ bool StringMatch(const wxChar *str1, const wxChar *str2, bool subString, Sstr1.MakeUpper(); Sstr2.MakeUpper(); } - return Sstr2.Index(Sstr1) != wxNOT_FOUND; + return Sstr2.Index(Sstr1) != (size_t)wxNOT_FOUND; } else return exact ? wxString(str2).Cmp(str1) == 0 :