NULL -> 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -500,7 +500,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
#else
|
#else
|
||||||
while ((*d++ = *s) != NULL) {
|
while ((*d++ = *s) != 0) {
|
||||||
# ifndef __WXMSW__
|
# ifndef __WXMSW__
|
||||||
if (*s == wxT('\\')) {
|
if (*s == wxT('\\')) {
|
||||||
if ((*(d - 1) = *++s)) {
|
if ((*(d - 1) = *++s)) {
|
||||||
@@ -520,7 +520,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
|
|||||||
register wxChar *start = d;
|
register wxChar *start = d;
|
||||||
register int braces = (*s == wxT('{') || *s == wxT('('));
|
register int braces = (*s == wxT('{') || *s == wxT('('));
|
||||||
register wxChar *value;
|
register wxChar *value;
|
||||||
while ((*d++ = *s) != NULL)
|
while ((*d++ = *s) != 0)
|
||||||
if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
|
if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
|
||||||
break;
|
break;
|
||||||
else
|
else
|
||||||
@@ -528,7 +528,7 @@ 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++) != NULL;);
|
for ((d = start - 1); (*d++ = *value++) != 0;);
|
||||||
d--;
|
d--;
|
||||||
if (braces && *s)
|
if (braces && *s)
|
||||||
s++;
|
s++;
|
||||||
@@ -580,7 +580,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
|
|||||||
*(d - 1) = SEP;
|
*(d - 1) = SEP;
|
||||||
}
|
}
|
||||||
s = nm;
|
s = nm;
|
||||||
while ((*d++ = *s++) != NULL);
|
while ((*d++ = *s++) != 0);
|
||||||
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);
|
||||||
|
Reference in New Issue
Block a user