new.c: Order two return statements to match comment.

[nmh] / sbr / ext_hook.c

diff --git a/sbr/ext_hook.c b/sbr/ext_hook.c
index 7b94e57a5cb194029b831aad7f1e0c26b4df04d1..3cde1fd960bd6222ee739a410bf10c63e465b6ba 100644 (file)
--- a/sbr/ext_hook.c
+++ b/sbr/ext_hook.c
@@ -22,13 +22,13 @@ ext_hook(char *hook_name, char *message_file_name_1, char *message_file_name_2)
 
     static  int        did_message = 0;        /* set if we've already output a message */
 
 
     static  int        did_message = 0;        /* set if we've already output a message */
 

-    if ((hook = context_find(hook_name)) == (char *)0)
-       return (OK);
+    if ((hook = context_find(hook_name)) == NULL)
+       return OK;

 
     switch (pid = fork()) {
     case -1:
        status = NOTOK;
 
     switch (pid = fork()) {
     case -1:
        status = NOTOK;

-       advise(NULL, "external database may be out-of-date.");
+       inform("external database may be out-of-date.");

        break;
 
     case 0:
        break;
 
     case 0:


@@ -49,8 +49,8 @@ ext_hook(char *hook_name, char *message_file_name_1, char *message_file_name_2)
     if (status != OK) {
        if (did_message == 0) {
            char *msghook;
     if (status != OK) {
        if (did_message == 0) {
            char *msghook;

-           if ((msghook = context_find("msg-hook")) != (char *)0)
-               advise(NULL, msghook);
+           if ((msghook = context_find("msg-hook")) != NULL)
+                inform("%s", msghook);

            else {
                char errbuf[BUFSIZ];
                snprintf(errbuf, sizeof(errbuf), "external hook \"%s\"", hook);
            else {
                char errbuf[BUFSIZ];
                snprintf(errbuf, sizeof(errbuf), "external hook \"%s\"", hook);


@@ -59,9 +59,7 @@ ext_hook(char *hook_name, char *message_file_name_1, char *message_file_name_2)
            did_message = 1;
        }
 
            did_message = 1;
        }
 

-       return (NOTOK);
-    }
-
-    else
-       return (OK);
+       return NOTOK;
+    } else
+       return OK;

 }
 }