diff options
| author | Archie Cobbs <archie@FreeBSD.org> | 1999-11-02 22:46:42 +0000 |
|---|---|---|
| committer | Archie Cobbs <archie@FreeBSD.org> | 1999-11-02 22:46:42 +0000 |
| commit | 60fffafdc3da6c0553021422d77dbaceb5811e51 (patch) | |
| tree | f379e55c4071e2df2aa688445973227b22b0c19f /sys/netncp | |
| parent | 2ea6270424c406c1b63d5a8de18b4d93bc5b4a8d (diff) | |
| download | src-60fffafdc3da6c0553021422d77dbaceb5811e51.tar.gz src-60fffafdc3da6c0553021422d77dbaceb5811e51.zip | |
Change structure field named 'toupper' to 'to_upper' to avoid conflict
with the macro of the same name. Same thing for 'tolower'.
Notes
Notes:
svn path=/head/; revision=52814
Diffstat (limited to 'sys/netncp')
| -rw-r--r-- | sys/netncp/ncp_nls.c | 10 | ||||
| -rw-r--r-- | sys/netncp/ncp_nls.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/netncp/ncp_nls.c b/sys/netncp/ncp_nls.c index be24e977c1f9..0c4de6c01780 100644 --- a/sys/netncp/ncp_nls.c +++ b/sys/netncp/ncp_nls.c @@ -188,14 +188,14 @@ struct ncp_nlstables ncp_defnls = { void ncp_str_upper(char *name) { while (*name) { - *name = ncp_defnls.toupper[(u_char)*name]; + *name = ncp_defnls.to_upper[(u_char)*name]; name++; } } void ncp_str_lower(char *name) { while (*name) { - *name = ncp_defnls.tolower[(u_char)*name]; + *name = ncp_defnls.to_lower[(u_char)*name]; name++; } } @@ -209,7 +209,7 @@ ncp_pathcheck(char *s, int len, struct ncp_nlstables *nt, int strict) { int opt = nt->opt; if (opt & (NWHP_UPPER | NWHP_LOWER)) - tbl = (opt & NWHP_UPPER) ? nt->toupper : nt->tolower; + tbl = (opt & NWHP_UPPER) ? nt->to_upper : nt->to_lower; if ((opt & NWHP_DOS) == 0) { while (len--) { sc = (u_char)*(s++); @@ -251,7 +251,7 @@ ncp_pathcopy(char *src, char *dst, int len, struct ncp_nlstables *nt) { } } else if (nt->opt & NWHP_DOS) { while (len--) { - c = nt->toupper[(u_char)*src]; + c = nt->to_upper[(u_char)*src]; *dst = donls ? nt->u2n[c] : c; dst++; src++; @@ -287,7 +287,7 @@ ncp_path2unix(char *src, char *dst, int len, struct ncp_nlstables *nt) { } return; } - tbl = (nt->opt & NWHP_LOWER) ? nt->tolower : nt->toupper; + tbl = (nt->opt & NWHP_LOWER) ? nt->to_lower : nt->to_upper; while (len--) { c = *src; *dst = tbl[donls ? nt->n2u[c] : c]; diff --git a/sys/netncp/ncp_nls.h b/sys/netncp/ncp_nls.h index 1bec4a752ccf..e5e06b3ee5e0 100644 --- a/sys/netncp/ncp_nls.h +++ b/sys/netncp/ncp_nls.h @@ -43,8 +43,8 @@ #define NWHP_NOSTRICT 0x20 /* pretend to be a case insensitive */ struct ncp_nlstables { - u_char *tolower; /* local charset to lower case */ - u_char *toupper; /* local charset to upper case */ + u_char *to_lower; /* local charset to lower case */ + u_char *to_upper; /* local charset to upper case */ u_char *n2u; /* NetWare to Unix */ u_char *u2n; int opt; /* may depend on context */ @@ -83,4 +83,4 @@ void ncp_path2unix(char *src, char *dst, int len, struct ncp_nlstables *nt); #endif /* !KERNEL */ -#endif /* _NCP_NCP_NLS_H_ */
\ No newline at end of file +#endif /* _NCP_NCP_NLS_H_ */ |