Strip parenthesis from `return (state = OK);' and similar.

There are sufficient cases without the parenthesis that various
compilers must be happy without.

diff --git a/sbr/dtime.c b/sbr/dtime.c
index b5039ed..5e0fdc0 100644 (file)
--- a/sbr/dtime.c
+++ b/sbr/dtime.c
@@ -355,7 +355,7 @@ dmktime (struct tws *tw)
     if (tw->tw_flags & TW_DST)
        result -= 60 * 60; /* One hour. */
 
     if (tw->tw_flags & TW_DST)
        result -= 60 * 60; /* One hour. */
 

-    return (tw->tw_clock = result);
+    return tw->tw_clock = result;

 }
 
 
 }
 
 

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index aeb770d..2ad46cf 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -352,7 +352,7 @@ lookup(char *name)
 
     while ((nm = t->name)) {
        if (*nm == c && strcmp (nm, name) == 0)
 
     while ((nm = t->name)) {
        if (*nm == c && strcmp (nm, name) == 0)

-           return (ftbl = t);
+           return ftbl = t;

 
        t++;
     }
 
        t++;
     }

diff --git a/sbr/geteditor.c b/sbr/geteditor.c
index 9889a5e..2fbe1f5 100644 (file)
--- a/sbr/geteditor.c
+++ b/sbr/geteditor.c
@@ -23,5 +23,5 @@ get_default_editor(void)
        str = "vi";
     }
 
        str = "vi";
     }
 

-    return (default_editor = str);
+    return default_editor = str;

 }
 }

diff --git a/sbr/mf.c b/sbr/mf.c
index 1ff8416..6c4afec 100644 (file)
--- a/sbr/mf.c
+++ b/sbr/mf.c
@@ -540,7 +540,7 @@ my_lex (char *buffer)
     bp = buffer;
     *bp = 0;
     if (!cp)
     bp = buffer;
     *bp = 0;
     if (!cp)

-       return (last_lex = LX_END);
+       return last_lex = LX_END;

 
     gotat = isat (cp);
     c = *cp++;
 
     gotat = isat (cp);
     c = *cp++;


@@ -548,7 +548,7 @@ my_lex (char *buffer)
        c = *cp++;
     if (c == 0) {
        cp = NULL;
        c = *cp++;
     if (c == 0) {
        cp = NULL;

-       return (last_lex = LX_END);
+       return last_lex = LX_END;

     }
 
     if (c == '(') {
     }
 
     if (c == '(') {


@@ -557,12 +557,12 @@ my_lex (char *buffer)
            switch (c = *cp++) {
                case 0: 
                    cp = NULL;
            switch (c = *cp++) {
                case 0: 
                    cp = NULL;

-                   return (last_lex = LX_ERR);
+                   return last_lex = LX_ERR;

                case '\\': 
                    ADDCHR(c);
                    if ((c = *cp++) == 0) {
                        cp = NULL;
                case '\\': 
                    ADDCHR(c);
                    if ((c = *cp++) == 0) {
                        cp = NULL;

-                       return (last_lex = LX_ERR);
+                       return last_lex = LX_ERR;

                    }
                    ADDCHR(c);
                    continue;
                    }
                    ADDCHR(c);
                    continue;


@@ -589,12 +589,12 @@ my_lex (char *buffer)
            switch (c = *cp++) {
                case 0: 
                    cp = NULL;
            switch (c = *cp++) {
                case 0: 
                    cp = NULL;

-                   return (last_lex = LX_ERR);
+                   return last_lex = LX_ERR;

                case '\\': 
                    ADDCHR(c);
                    if ((c = *cp++) == 0) {
                        cp = NULL;
                case '\\': 
                    ADDCHR(c);
                    if ((c = *cp++) == 0) {
                        cp = NULL;

-                       return (last_lex = LX_ERR);
+                       return last_lex = LX_ERR;

                    }
                    /* FALLTHRU */
                default: 
                    }
                    /* FALLTHRU */
                default: 


@@ -603,7 +603,7 @@ my_lex (char *buffer)
                case '"': 
                    ADDCHR(c);
                    *bp = 0;
                case '"': 
                    ADDCHR(c);
                    *bp = 0;

-                   return (last_lex = LX_QSTR);
+                   return last_lex = LX_QSTR;

            }
     }
     
            }
     }
     


@@ -613,12 +613,12 @@ my_lex (char *buffer)
            switch (c = *cp++) {
                case 0: 
                    cp = NULL;
            switch (c = *cp++) {
                case 0: 
                    cp = NULL;

-                   return (last_lex = LX_ERR);
+                   return last_lex = LX_ERR;

                case '\\': 
                    ADDCHR(c);
                    if ((c = *cp++) == 0) {
                        cp = NULL;
                case '\\': 
                    ADDCHR(c);
                    if ((c = *cp++) == 0) {
                        cp = NULL;

-                       return (last_lex = LX_ERR);
+                       return last_lex = LX_ERR;

                    }
                    /* FALLTHRU */
                default: 
                    }
                    /* FALLTHRU */
                default: 


@@ -627,7 +627,7 @@ my_lex (char *buffer)
                case ']': 
                    ADDCHR(c);
                    *bp = 0;
                case ']': 
                    ADDCHR(c);
                    *bp = 0;

-                   return (last_lex = LX_DLIT);
+                   return last_lex = LX_DLIT;

            }
     }
     
            }
     }
     


@@ -635,10 +635,10 @@ my_lex (char *buffer)
     *bp = 0;
     for (i = 0; special[i].lx_chr != 0; i++)
        if (c == special[i].lx_chr)
     *bp = 0;
     for (i = 0; special[i].lx_chr != 0; i++)
        if (c == special[i].lx_chr)

-           return (last_lex = special[i].lx_val);
+           return last_lex = special[i].lx_val;

 
     if (iscntrl ((unsigned char) c))
 
     if (iscntrl ((unsigned char) c))

-       return (last_lex = LX_ERR);
+       return last_lex = LX_ERR;

 
     for (;;) {
        if ((c = *cp++) == 0)
 
     for (;;) {
        if ((c = *cp++) == 0)


@@ -663,7 +663,7 @@ got_atom: ;
  my_lex_buffull:
     /* Out of buffer space. *bp is the last byte in the buffer */
     *bp = 0;
  my_lex_buffull:
     /* Out of buffer space. *bp is the last byte in the buffer */
     *bp = 0;

-    return (last_lex = LX_ERR);
+    return last_lex = LX_ERR;

 }
 
 
 }
 
 

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index 7e8cf29..40687bb 100644 (file)
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -343,13 +343,13 @@ getalias (char *addrs)
     if (cp == NULL)
        cp = addrs;
     else if (*cp == 0)
     if (cp == NULL)
        cp = addrs;
     else if (*cp == 0)

-        return (cp = NULL);
+        return cp = NULL;

 
     /* Remove leading any space from the address. */
     for (pp = cp; isspace ((unsigned char) *pp); pp++)
        continue;
     if (*pp == 0)
 
     /* Remove leading any space from the address. */
     for (pp = cp; isspace ((unsigned char) *pp); pp++)
        continue;
     if (*pp == 0)

-       return (cp = NULL);
+       return cp = NULL;

     /* Find the end of the address. */
     for (qp = pp; *qp != 0 && *qp != ','; qp++)
        continue;
     /* Find the end of the address. */
     for (qp = pp; *qp != 0 && *qp != ','; qp++)
        continue;

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index f51c562..bf3ed23 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -748,7 +748,7 @@ evalvar (struct mcomp *c1)
     if (!strcasecmp (name, "length"))
        return ptoi (name, &c1->c_length);
     if (!strcasecmp (name, "nodashstuffing"))
     if (!strcasecmp (name, "length"))
        return ptoi (name, &c1->c_length);
     if (!strcasecmp (name, "nodashstuffing"))

-       return (dashstuff = -1);
+       return dashstuff = -1;

 
     for (ap = triples; ap->t_name; ap++)
        if (!strcasecmp (ap->t_name, name)) {
 
     for (ap = triples; ap->t_name; ap++)
        if (!strcasecmp (ap->t_name, name)) {


@@ -1409,7 +1409,7 @@ oneline (char *stuff, unsigned long flags)
     if (onelp == NULL)
        onelp = stuff;
     if (*onelp == 0)
     if (onelp == NULL)
        onelp = stuff;
     if (*onelp == 0)

-       return (onelp = NULL);
+       return onelp = NULL;

 
     ret = onelp;
     term = 0;
 
     ret = onelp;
     term = 0;

diff --git a/uip/slocal.c b/uip/slocal.c
index 6866a0b..a4344fd 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -931,13 +931,13 @@ logged_in (void)
             if (debug)
                 continue;
             endutxent();
             if (debug)
                 continue;
             endutxent();

-            return (utmped = DONE);
+            return utmped = DONE;

         }
     }
 
     endutxent();
 #endif /* HAVE_GETUTXENT */
         }
     }
 
     endutxent();
 #endif /* HAVE_GETUTXENT */

-    return (utmped = NOTOK);
+    return utmped = NOTOK;

 }
 
 #define        check(t,a,b)            if (t < a || t > b) return -1
 }
 
 #define        check(t,a,b)            if (t < a || t > b) return -1