Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed signed/unsigned comparison warnings; reformatted the code a little

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-17 22:55:05 +00:00
parent 1693108cfe
commit f252b6587c
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
utils/tex2rtf/src/htmlutil.cpp
View File

@@ -251,9 +251,9 @@ void ReopenSectionContentsFile(void)
struct textreplace struct textreplace
{ {
wxChar *text; wxChar *text;
int text_length; size_t text_length;
wxChar *replace; wxChar *replace;
int replace_length; size_t replace_length;
}; };
#define tr(x,y) {x, sizeof(x)-1, y, sizeof(y)-1} #define tr(x,y) {x, sizeof(x)-1, y, sizeof(y)-1}
@@ -285,7 +285,7 @@ void ProcessText2HTML(TexChunk *chunk)
int ptr = 0; int ptr = 0;
int i = 0; int i = 0;
wxChar ch = 1; wxChar ch = 1;
int len = wxStrlen(chunk->value); size_t len = wxStrlen(chunk->value);
while (ch != 0) while (ch != 0)
{ {
ch = chunk->value[i]; ch = chunk->value[i];
@@ -313,24 +313,30 @@ void ProcessText2HTML(TexChunk *chunk)
bool replaced = false; bool replaced = false;
if (!inVerbatim) if (!inVerbatim)
{ {
int x,y; for (size_t x = 0; x < WXSIZEOF(notverb_array); x++)
for (x = 0; x < sizeof (notverb_array) / sizeof(textreplace); x++)
{ {
textreplace& tr = notverb_array[x]; textreplace& tr = notverb_array[x];
if (ch != tr.text[0]) continue; if (ch != tr.text[0])
if (len < tr.text_length) continue; continue;
if (len < tr.text_length)
continue;
size_t y;
for (y = 1; y < tr.text_length; y++) for (y = 1; y < tr.text_length; y++)
{ {
if (chunk->value[y] != tr.text[y]) break; if (chunk->value[y] != tr.text[y])
break;
} }
if (y != tr.text_length) continue;
if (y != tr.text_length)
continue;
// can now copy it over. // can now copy it over.
for (y = 0; y < tr.replace_length; y++) for (y = 0; y < tr.replace_length; y++)
{ {
BigBuffer[ptr++] = tr.replace[y]; BigBuffer[ptr++] = tr.replace[y];
} }
len -= tr.text_length; len -= tr.text_length;
i += tr.text_length; i += tr.text_length;
replaced = true; replaced = true;