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

Applied patch [ 651383 ] Removes 3 warnings when building w/ CW6

Browse Source 
Dimitri Schoolwerth


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-12-10 21:44:08 +00:00
parent dda4f6c089
commit f0e1c34310
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/filefn.cpp
View File

@@ -428,7 +428,11 @@ wxChar *wxRealPath (wxChar *path)
if (p[1] == wxT('.') && p[2] == wxT('.') && (p[3] == SEP || p[3] == wxT('\0'))) if (p[1] == wxT('.') && p[2] == wxT('.') && (p[3] == SEP || p[3] == wxT('\0')))
{ {
wxChar *q; wxChar *q;
for (q = p - 1; q >= path && *q != SEP; q--); for (q = p - 1; q >= path && *q != SEP; q--)
{
// Empty
}
if (q[0] == SEP && (q[1] != wxT('.') || q[2] != wxT('.') || q[3] != SEP) if (q[0] == SEP && (q[1] != wxT('.') || q[2] != wxT('.') || q[3] != SEP)
&& (q - 1 <= path || q[-1] != SEP)) && (q - 1 <= path || q[-1] != SEP))
{ {
@@ -592,7 +596,11 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
*--d = 0; *--d = 0;
value = wxGetenv(braces ? start + 1 : start); value = wxGetenv(braces ? start + 1 : start);
if (value) { if (value) {
for ((d = start - 1); (*d++ = *value++) != 0;); for ((d = start - 1); (*d++ = *value++) != 0;)
{
// Empty
}
d--; d--;
if (braces && *s) if (braces && *s)
s++; s++;
@@ -616,7 +624,10 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
{ /* ~user/filename */ { /* ~user/filename */
register wxChar *nnm; register wxChar *nnm;
register wxChar *home; register wxChar *home;
for (s = nm; *s && *s != SEP; s++); for (s = nm; *s && *s != SEP; s++)
{
// Empty
}
int was_sep; /* MATTHEW: Was there a separator, or NULL? */ int was_sep; /* MATTHEW: Was there a separator, or NULL? */
was_sep = (*s == SEP); was_sep = (*s == SEP);
nnm = *s ? s + 1 : s; nnm = *s ? s + 1 : s;
@@ -643,7 +654,10 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
*(d - 1) = SEP; *(d - 1) = SEP;
} }
s = nm; s = nm;
while ((*d++ = *s++) != 0); while ((*d++ = *s++) != 0)
{
// Empty
}
delete[] nm_tmp; // clean up alloc delete[] nm_tmp; // clean up alloc
/* Now clean up the buffer */ /* Now clean up the buffer */
return wxRealPath(buf); return wxRealPath(buf);