stable now but there are GIANT PIECES MISSING

[citadel.git] / citadel / modules / rwho / serv_rwho.c

diff --git a/citadel/modules/rwho/serv_rwho.c b/citadel/modules/rwho/serv_rwho.c
index 79ea2c6bda50acbb365e14605d21845d4383c289..a134a8c257f49a58cecef5ad914e871825ed9b6c 100644 (file)
--- a/citadel/modules/rwho/serv_rwho.c
+++ b/citadel/modules/rwho/serv_rwho.c
@@ -23,18 +23,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
@@ -48,8 +37,6 @@
 #include "user_ops.h"
 #include "database.h"
 #include "msgbase.h"
-
-
 #include "ctdl_module.h"
 
 /* Don't show the names of private rooms unless the viewing
@@ -91,7 +78,7 @@ void cmd_rwho(char *argbuf) {
        int nContexts, i;
        int spoofed = 0;
        int aide;
-       char real_room[ROOMNAMELEN], room[ROOMNAMELEN];
+       char room[ROOMNAMELEN];
        char flags[5];
        
        /* So that we don't keep the context list locked for a long time
@@ -126,7 +113,7 @@ void cmd_rwho(char *argbuf) {
                        strcat(flags, ".");
                }
                   
-               GenerateRoomDisplay(real_room, &nptr[i], CC);
+               GenerateRoomDisplay(room, &nptr[i], CC);
 
                 if ((aide) && (spoofed)) {
                        strcat(flags, "+");