projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* move some more vars from the session context to strbuf (the use of StrBufAppendTemp...
[citadel.git]
/
webcit
/
wiki.c
diff --git
a/webcit/wiki.c
b/webcit/wiki.c
index 067ac6d3821ca1d4cde9f4b697638fcbb347b202..1bbb38dbe88711dc7733187081a24c6e839a2a27 100644
(file)
--- a/
webcit/wiki.c
+++ b/
webcit/wiki.c
@@
-34,27
+34,27
@@
void str_wiki_index(char *s)
*/
void display_wiki_page(void)
{
*/
void display_wiki_page(void)
{
- c
har roomname[128]
;
+ c
onst StrBuf *roomname
;
char pagename[128];
char errmsg[256];
long msgnum = (-1L);
char pagename[128];
char errmsg[256];
long msgnum = (-1L);
-
safestrncpy(roomname, bstr("room"), sizeof roomname
);
+
roomname = sbstr("room"
);
safestrncpy(pagename, bstr("page"), sizeof pagename);
str_wiki_index(pagename);
safestrncpy(pagename, bstr("page"), sizeof pagename);
str_wiki_index(pagename);
- if (
!IsEmptyStr(roomname)
) {
+ if (
StrLength(roomname) > 0
) {
/* If we're not in the correct room, try going there. */
/* If we're not in the correct room, try going there. */
- if (strcasecmp(
roomname, WC->wc_roomname
)) {
+ if (strcasecmp(
ChrPtr(roomname), ChrPtr(WC->wc_roomname)
)) {
gotoroom(roomname);
}
/* If we're still not in the correct room, it doesn't exist. */
gotoroom(roomname);
}
/* If we're still not in the correct room, it doesn't exist. */
- if (strcasecmp(
roomname, WC->wc_roomname
)) {
+ if (strcasecmp(
ChrPtr(roomname), ChrPtr(WC->wc_roomname)
)) {
snprintf(errmsg, sizeof errmsg,
snprintf(errmsg, sizeof errmsg,
- _("There is no room called '%s'."),
-
roomname
);
+
_("There is no room called '%s'."),
+
ChrPtr(roomname)
);
convenience_page("FF0000", _("Error"), errmsg);
return;
}
convenience_page("FF0000", _("Error"), errmsg);
return;
}
@@
-64,7
+64,7
@@
void display_wiki_page(void)
if (WC->wc_view != VIEW_WIKI) {
snprintf(errmsg, sizeof errmsg,
_("'%s' is not a Wiki room."),
if (WC->wc_view != VIEW_WIKI) {
snprintf(errmsg, sizeof errmsg,
_("'%s' is not a Wiki room."),
-
roomname
);
+
ChrPtr(roomname)
);
convenience_page("FF0000", _("Error"), errmsg);
return;
}
convenience_page("FF0000", _("Error"), errmsg);
return;
}