char* pD = z_TYPE;
while (ps < pe)
- *(pD++) = toupper( *(pd++) = *(ps++) );
+ *(pD++) = TOUPPER( *(pd++) = *(ps++) );
*pD = *pd = NUL;
}
"wrap-fix" );
for (;;) {
- char ch = *(pz_src++);
+ char ch = *pz_src++;
- if (ISLOWER (ch))
- *(pz_dst++) = TOUPPER ( ch );
-
- else if (ISALNUM ( ch ))
- *(pz_dst++) = ch;
-
- else if (ch == NUL) {
- *(pz_dst++) = ch;
+ if (ch == NUL) {
+ *pz_dst++ = ch;
break;
+ } else if (! ISALNUM (ch)) {
+ *pz_dst++ = '_';
+ } else {
+ *pz_dst++ = TOUPPER (ch);
}
- else
- *(pz_dst++) = '_';
if (++len >= sizeof( z_fixname )) {
void* p = xmalloc( len + strlen( pz_src ) + 1 );