de-apify GenerateRoomDisplay(), its only needed in serv_rwho.

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 28de7e6bf2d21925984b508b3e8cf2aa6e65b160..666c9cb52aa783a772dce1fd67bc514db8f78bc4 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -368,36 +368,6 @@ int CtdlIsPublicClient(void)
 
 
 
-
-/* Don't show the names of private rooms unless the viewing
- * user also knows the rooms.
- */
-void GenerateRoomDisplay(char *real_room,
-                       CitContext *viewed,
-                       CitContext *viewer) {
-
-       int ra;
-
-       strcpy(real_room, viewed->room.QRname);
-       if (viewed->room.QRflags & QR_MAILBOX) {
-               strcpy(real_room, &real_room[11]);
-       }
-       if (viewed->room.QRflags & QR_PRIVATE) {
-               CtdlRoomAccess(&viewed->room, &viewer->user, &ra, NULL);
-               if ( (ra & UA_KNOWN) == 0) {
-                       strcpy(real_room, " ");
-               }
-       }
-
-       if (viewed->cs_flags & CS_CHAT) {
-               while (strlen(real_room) < 14) {
-                       strcat(real_room, " ");
-               }
-               strcpy(&real_room[14], "<chat>");
-       }
-
-}
-
 /*
  * Convenience function.
  */

diff --git a/citadel/citserver.h b/citadel/citserver.h
index 3e616b19fb9b3065d3171c466e5392e16d030098..4224fcdcb3d56934b5a309575aeda98d6060d54a 100644 (file)
--- a/citadel/citserver.h
+++ b/citadel/citserver.h
@@ -45,9 +45,6 @@ void do_async_loop(void);
 void begin_session(struct CitContext *con);
 void citproto_begin_session(void);
 void citproto_begin_admin_session(void);
-void GenerateRoomDisplay(char *real_room,
-                        CitContext *viewed,
-                        CitContext *viewer);
 
 void help_subst (char *strbuf, char *source, char *dest);
 

diff --git a/citadel/modules/rwho/serv_rwho.c b/citadel/modules/rwho/serv_rwho.c
index 09e256f8657466f32ada03c65e875b785975cd55..4c2e28cdc80495e92c7254bdb2d8d84eec588f0a 100644 (file)
--- a/citadel/modules/rwho/serv_rwho.c
+++ b/citadel/modules/rwho/serv_rwho.c
@@ -52,6 +52,36 @@
 
 #include "ctdl_module.h"
 
+/* Don't show the names of private rooms unless the viewing
+ * user also knows the rooms.
+ */
+void GenerateRoomDisplay(char *real_room,
+                       CitContext *viewed,
+                       CitContext *viewer) {
+
+       int ra;
+
+       strcpy(real_room, viewed->room.QRname);
+       if (viewed->room.QRflags & QR_MAILBOX) {
+               strcpy(real_room, &real_room[11]);
+       }
+       if (viewed->room.QRflags & QR_PRIVATE) {
+               CtdlRoomAccess(&viewed->room, &viewer->user, &ra, NULL);
+               if ( (ra & UA_KNOWN) == 0) {
+                       strcpy(real_room, " ");
+               }
+       }
+
+       if (viewed->cs_flags & CS_CHAT) {
+               while (strlen(real_room) < 14) {
+                       strcat(real_room, " ");
+               }
+               strcpy(&real_room[14], "<chat>");
+       }
+
+}
+
+
 
 /*
  * display who's online