indent -kr -i8 -brf -bbb -fnc -l132 -nce on all of webcit-classic

[citadel.git] / webcit / addressbook_popup.c

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index 995ec6fd0219920ca92d36efd754171476e4123a..097d13a55454eace8ebdc9299a0bfe204af36cc6 100644 (file)
--- a/webcit/addressbook_popup.c
+++ b/webcit/addressbook_popup.c
@@ -1,5 +1,6 @@
+
 /*
- * AJAX-powered auto-completion
+ * Dynamic HTML (formerly known as "AJAX") powered auto-completion
  *
  * Copyright (c) 1996-2012 by the citadel.org team
  *
@@ -18,8 +19,7 @@
 /*
  * Address book popup results
  */
-HashList* GetAddressbookList()
-{
+HashList *GetAddressbookList() {
        HashList *List = NULL;
        const StrBuf *WhichAddrBook;
        StrBuf *saved_roomname;
@@ -28,7 +28,7 @@ HashList* GetAddressbookList()
        long BufLen;
        int IsLocalAddrBook;
 
-       WhichAddrBook = SBSTR("which_addr_book");
+       WhichAddrBook = sbstr("which_addr_book");
        IsLocalAddrBook = strcasecmp(ChrPtr(WhichAddrBook), "__LOCAL_USERS__") == 1;
 
        if (IsLocalAddrBook) {
@@ -41,19 +41,13 @@ HashList* GetAddressbookList()
                gotoroom(WhichAddrBook);
                serv_puts("DVCA");
        }
-       
+
        Line = NewStrBuf();
        StrBuf_ServGetln(Line);
-       if (GetServerStatus(Line, NULL)  == 1) {
+       if (GetServerStatus(Line, NULL) == 1) {
                List = NewHash(1, NULL);
-               while (BufLen = StrBuf_ServGetln(Line), 
-                      ((BufLen >= 0) && 
-                       ((BufLen != 3) || strcmp(ChrPtr(Line), "000"))))
-               {
-                       if (IsLocalAddrBook &&
-                           (BufLen > 5) &&
-                           (strncmp(ChrPtr(Line), "SYS_", 4) == 0))
-                       {
+               while (BufLen = StrBuf_ServGetln(Line), ((BufLen >= 0) && ((BufLen != 3) || strcmp(ChrPtr(Line), "000")))) {
+                       if (IsLocalAddrBook && (BufLen > 5) && (strncmp(ChrPtr(Line), "SYS_", 4) == 0)) {
                                continue;
                        }
                        Name = NewStrBufPlain(NULL, StrLength(Line));
@@ -75,10 +69,7 @@ HashList* GetAddressbookList()
 
 
 
-void 
-InitModule_ADDRBOOK_POPUP
-(void)
-{
+void InitModule_ADDRBOOK_POPUP(void) {
 
        RegisterIterator("ITERATE:ABNAMES", 0, NULL, GetAddressbookList, NULL, NULL, CTX_STRBUF, CTX_NONE, IT_NOFLAG);
 }