nickwatch: Implement hook for messages/notices.

[irc/quakenet/newserv.git] / helpmod2 / hterm.c

diff --git a/helpmod2/hterm.c b/helpmod2/hterm.c
index 937165075a41f3d09b3b3cb8f91f8fe77a823524..4e7abebc7d67e60773d0c25652e6f3a32f6c0341 100644 (file)
--- a/helpmod2/hterm.c
+++ b/helpmod2/hterm.c
@@ -2,7 +2,6 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "../lib/sstring.h"
 
 #include "hterm.h"
 
@@ -18,9 +17,12 @@ hterm *hterm_add(hterm** ptr, const char *name, const char *desc)
     if (name == NULL || desc == NULL || hterm_get(*ptr, name))
         return NULL;
 
-    htrm = (hterm*)malloc(sizeof(htrm));
+    for (;*ptr && strcmp(name, (*ptr)->name->content) > 0;ptr = &(*ptr)->next);
+
+    htrm = (hterm*)malloc(sizeof(hterm));
     htrm->name = getsstring(name, strlen(name));
     htrm->description = getsstring(desc, strlen(desc));
+    htrm->usage = 0;
 
     htrm->next = *ptr;
     *ptr = htrm;
@@ -30,18 +32,12 @@ hterm *hterm_add(hterm** ptr, const char *name, const char *desc)
 
 hterm *hterm_get(hterm *source, const char *str)
 {
-    hterm *ptr;
-    if (source == NULL)
-        ptr = hterms;
-    else
-        ptr = source;
+    hterm *ptr = source;
+
     for (;ptr;ptr = ptr->next)
         if (!ci_strcmp(ptr->name->content, str))
             return ptr;
-    if (source != NULL)
-        return hterm_get(NULL, str);
-    else
-        return NULL;
+    return NULL;
 }
 
 hterm *hterm_find(hterm *source, const char *str)
@@ -49,9 +45,6 @@ hterm *hterm_find(hterm *source, const char *str)
     hterm *ptr;
     char buffer[512];
 
-    if (source == NULL)
-        source = hterms;
-
     sprintf(buffer, "*%s*", str);
 
     for (ptr = source;ptr;ptr = ptr->next)
@@ -60,40 +53,44 @@ hterm *hterm_find(hterm *source, const char *str)
     for (ptr = source;ptr;ptr = ptr->next)
         if (strregexp(ptr->description->content, buffer))
             return ptr;
-    if (source == NULL)
-        return hterm_find(NULL, str);
-    else
-        return NULL;
+    return NULL;
 }
 
 hterm *hterm_get_and_find(hterm *source, const char *str)
 {
-    /*hterm *ptr = hterm_get(source, str);
-    if (ptr == NULL)
-        ptr = hterm_find(source, str);
-        return ptr;*/
-    /* search order: get source, get NULL, find source, find NULL */
+    /* search order: get source, get hterms, find source, find hterms */
     hterm *ptr;
     ptr = hterm_get(source, str);
     if (ptr != NULL)
+    {
+        ptr->usage++;
         return ptr;
-    ptr = hterm_get(NULL, str);
+    }
+    ptr = hterm_get(hterms, str);
     if (ptr != NULL)
+    {
+        ptr->usage++;
         return ptr;
+    }
     ptr = hterm_find(source, str);
     if (ptr != NULL)
+    {
+        ptr->usage++;
+        return ptr;
+    }
+    ptr = hterm_find(hterms, str);
+    if (ptr != NULL)
+    {
+        ptr->usage++;
         return ptr;
-    ptr = hterm_find(NULL, str);
-    return ptr;
+    }
+    return NULL;
 }
 
 hterm *hterm_del(hterm** start, hterm *htrm)
 {
     hterm** ptr = start;
 
-    if (start == NULL)
-        ptr = &hterms;
-
     for (;*ptr;ptr = &(*ptr)->next)
         if (*ptr == htrm)
         {
@@ -106,10 +103,7 @@ hterm *hterm_del(hterm** start, hterm *htrm)
             return NULL;
         }
 
-    if (start != NULL)
-        return hterm_del(NULL, htrm);
-    else
-        return htrm;
+    return htrm;
 }
 
 void hterm_del_all(hterm **source)