summaryrefslogtreecommitdiffstats
path: root/mbbsd/name.c
diff options
context:
space:
mode:
authorin2 <in2@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-12-06 18:26:03 +0800
committerin2 <in2@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-12-06 18:26:03 +0800
commit2178431a36c1d444ee05aaeb4fd9ca91c7571a2b (patch)
tree11c191277b0578af603afb4e877afb96e0eb4b61 /mbbsd/name.c
parentc876b5327229175e098c2c6490d01c28c71a08b3 (diff)
downloadpttbbs-2178431a36c1d444ee05aaeb4fd9ca91c7571a2b.tar
pttbbs-2178431a36c1d444ee05aaeb4fd9ca91c7571a2b.tar.gz
pttbbs-2178431a36c1d444ee05aaeb4fd9ca91c7571a2b.tar.bz2
pttbbs-2178431a36c1d444ee05aaeb4fd9ca91c7571a2b.tar.lz
pttbbs-2178431a36c1d444ee05aaeb4fd9ca91c7571a2b.tar.xz
pttbbs-2178431a36c1d444ee05aaeb4fd9ca91c7571a2b.tar.zst
pttbbs-2178431a36c1d444ee05aaeb4fd9ca91c7571a2b.zip
discard r2368 due to compilation failure
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2371 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'mbbsd/name.c')
-rw-r--r--mbbsd/name.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/mbbsd/name.c b/mbbsd/name.c
index 0c9009e8..9253a843 100644
--- a/mbbsd/name.c
+++ b/mbbsd/name.c
@@ -661,14 +661,13 @@ generalnamecomplete(char *prompt, char *data, int len, size_t nmemb,
int
completeboard_compar(int where, char *str, int len)
{
- boardheader_t *bh = &bcache[SHM->bsorted[0][where]];
- return strncasecmp(bh->brdname, str, len);
+ return strncasecmp(SHM->bsorted[0][where]->brdname, str, len);
}
int
completeboard_permission(int where)
{
- boardheader_t *bptr = &bcache[SHM->bsorted[0][where]];
+ boardheader_t *bptr = SHM->bsorted[0][where];
return (!(bptr->brdattr & BRD_SYMBOLIC) &&
(GROUPOP() || HasPerm(bptr)) &&
!(bptr->brdattr & BRD_GROUPBOARD));
@@ -677,29 +676,28 @@ completeboard_permission(int where)
char *
completeboard_getname(int where)
{
- return bcache[SHM->bsorted[0][where]].brdname;
+ return SHM->bsorted[0][where]->brdname;
}
/* general complete functions (utmpshm) */
int
completeutmp_compar(int where, char *str, int len)
{
- userinfo_t *u = &SHM->uinfo[SHM->sorted[SHM->currsorted][0][where]];
- return strncasecmp(u->userid, str, len);
+ return strncasecmp(SHM->sorted[SHM->currsorted][0][where]->userid,
+ str, len);
}
int
completeutmp_permission(int where)
{
- userinfo_t *u = &SHM->uinfo[SHM->sorted[SHM->currsorted][0][where]];
return (unlikely(HAS_PERM(PERM_SYSOP)) ||
unlikely(HAS_PERM(PERM_SEECLOAK)) ||
// !SHM->sorted[SHM->currsorted][0][where]->invisible);
- isvisible(currutmp, u));
+ isvisible(currutmp, SHM->sorted[SHM->currsorted][0][where]));
}
char *
completeutmp_getname(int where)
{
- return SHM->uinfo[SHM->sorted[SHM->currsorted][0][where]].userid;
+ return SHM->sorted[SHM->currsorted][0][where]->userid;
}