Use braces with control statements in #ifdef'ed out code

Author: LegalizeAdulthood

libtrn/art.cpp

@@ -186,7 +186,9 @@ do_article_result do_article()
         ART_LINE linenum = 1;
 #if 0 /* This causes a bug (headers displayed twice sometimes when you press v then ^R) */
         if (!g_do_hiding)
+        {
             g_is_mime = false;
+        }
 #endif
         if (s_firstpage) {
             if (g_firstline) {
@@ -501,7 +503,7 @@ do_article_result do_article()
 #ifdef DEBUG
                         if (debug & DEB_INNERSRCH && outpos < g_tc_COLS - 6) {
                             standout();
-                            printf("%4d",g_artline); 
+                            printf("%4d",g_artline);
                             un_standout();
                         }
 #endif
@@ -1253,7 +1255,9 @@ bool innermore()
     if (g_artpos < g_innersearch) {             /* not even on page yet? */
 #ifdef DEBUG
         if (debug & DEB_INNERSRCH)
+        {
             printf("Not on page %ld < %ld\n",(long)g_artpos,(long)g_innersearch);
+        }
 #endif
         return true;
     }

libtrn/artsrch.cpp

@@ -447,7 +447,9 @@ static bool wanted(COMPEX *compex, ART_NUM artnum, art_scope scope)
         strncpy(g_buf+9,fetchsubj(artnum,false),256);
 #ifdef DEBUG
         if (debug & DEB_SEARCH_AHEAD)
+        {
             printf("%s\n",g_buf);
+        }
 #endif
         break;
       case ARTSCOPE_FROM:

libtrn/backpage.cpp

@@ -71,12 +71,18 @@ void vwtary(ART_LINE indx, ART_POS newvalue)
 
 #ifdef DEBUG
     if (indx < 0)
+    {
         printf("vwtary(%ld)\n",(long)indx);
+    }
     if (!indx)
+    {
         maxindx = 0;
+    }
     if (indx > maxindx) {
         if (indx != maxindx + 1)
+        {
             printf("indx skipped %d-%d\n",maxindx+1,indx-1);
+        }
         maxindx = indx;
     }
 #endif

libtrn/bits.cpp

@@ -90,7 +90,9 @@ void rc_to_bits()
         termdown(2);
         for (i = article_first(g_absfirst); i < g_firstart; i = article_next(i)) {
             if (article_unread(i))
+            {
                 printf("%ld ",(long)i);
+            }
         }
     }
 #endif
@@ -637,7 +639,9 @@ static bool check_chase(char *ptr, int until_key)
         chase_xref(article_num(ap),true);
         ap->flags &= ~AF_MCHASE;
         if (!--s_chase_count)
+        {
             return 1;
+        }
     }
 #endif
     if (until_key && input_pending())
@@ -785,16 +789,22 @@ static bool valid_xref_site(ART_NUM artnum, char *site)
     {
         char* t = strchr(s+7, '.');
         if (t)
+        {
             *t = '\0';
+        }
         inews_site = savestr(s+7);
     }
 #endif /* ANCIENT_NEWS */
     else
+    {
         inews_site = savestr("");
+    }
     free(sitebuf);
 
     if (!strcmp(site,inews_site))
+    {
         return true;
+    }
 
 #ifdef DEBUG
     if (debug) {

libtrn/cache.cpp

@@ -205,10 +205,14 @@ void cache_article(ARTICLE *ap)
             if (ap->subj->flags & SF_WASSELECTED) {
 #if 0
                 if (g_selected_only)
+                {
                     ap->flags |= g_sel_mask;
+                }
                 else
 #endif
+                {
                     select_article(ap, AUTO_KILL_NONE);
+                }
             }
             ap->subj->flags |= SF_VISIT;
         }
@@ -321,7 +325,9 @@ void check_poster(ARTICLE *ap)
 #ifdef REPLYTO_POSTER_CHECKING
                     char* reply_buf = fetchlines(article_num(ap),REPLY_LINE);
                     if (in_string(reply_buf, g_login_name.c_str(), true))
+                    {
                         select_subthread(ap,AUTO_SEL_FOL);
+                    }
                     free(reply_buf);
 #endif
                 }

libtrn/edit_dist.cpp

@@ -173,11 +173,15 @@ int edit_distn(const char *from, int from_len, const char *to, int to_len)
 #ifdef DEBUG_EDITDIST
     printf("      ");
     for (col = 0; col < from_len; col++)
+    {
         printf(" %c ", from[col]);
+    }
     printf("\n   ");
 
     for (col = 0; col <= from_len; col++)
+    {
         printf("%2d ", col * del);
+    }
 #endif
 
 /* Row 0 is handled implicitly; its value at a given column is   col*del.
@@ -245,9 +249,13 @@ int edit_distn(const char *from, int from_len, const char *to, int to_len)
         } /* for col = 1 */
 #ifdef DEBUG_EDITDIST
         if (row < to_len - 1)
+        {
             printf("\n %c %2d ", to[row+1], (row + 2) * ins);
+        }
         else
+        {
             printf("\n");
+        }
 #endif
 #ifdef TRN_SPEEDUP
         if (low > MIN_DIST)

libtrn/final.cpp

@@ -139,7 +139,9 @@ Signal_t int_catcher(int dummy)
     sigset(SIGINT,int_catcher);
 #ifdef DEBUG
     if (debug)
+    {
         write(2,"int_catcher\n",12);
+    }
 #endif
     if (!g_waiting) {
         if (g_int_count++) {            /* was there already an interrupt? */
@@ -264,19 +266,21 @@ Signal_t stop_catcher(int signo)
         resetty();              /* this is the point of all this */
 #ifdef DEBUG
         if (debug)
+        {
             write(2,"stop_catcher\n",13);
+        }
 #endif
         fflush(stdout);
         sigset(signo,SIG_DFL);  /* enable stop */
 #ifdef HAS_SIGBLOCK
         sigsetmask(sigblock(0) & ~(1 << (signo-1)));
 #endif
         kill(0,signo);          /* and do the stop */
-            savetty();
+        savetty();
 #ifdef MAILCALL
-            g_mailcount = 0;                    /* force recheck */
+        g_mailcount = 0;                    /* force recheck */
 #endif
-            if (!g_panic) {
+        if (!g_panic) {
             if (!g_waiting) {
                 termlib_init();
                 noecho();                       /* set no echo */
@@ -285,7 +289,7 @@ Signal_t stop_catcher(int signo)
                                                 /* (defined only if TIOCSTI defined) */
                 errno = 0;                      /* needed for getcmd */
             }
-            }
+        }
         xmouse_check();
     }
     sigset(signo,stop_catcher); /* unenable the stop */

libtrn/hash.cpp

@@ -275,7 +275,9 @@ static void hefree(HASHENT *hp)
 {
 #ifdef HASH_FREE_ENTRIES
     if (s_reusables >= RETAIN)          /* compost heap is full? */
+    {
         free((char*)hp);                /* yup, just pitch this one */
+    }
     else {                              /* no, just stash for reuse */
         ++s_reusables;
         hp->he_next = s_hereuse;

libtrn/head.cpp

@@ -230,7 +230,9 @@ void start_header(ART_NUM artnum)
 {
 #ifdef DEBUG
     if (debug & DEB_HEADER)
+    {
         dumpheader("start_header\n");
+    }
 #endif
     for (HEADTYPE &i : g_htype)
     {
@@ -303,7 +305,9 @@ bool parseline(char *art_buf, int newhide, int oldhide)
             }
 #ifdef DEBUG
             if (debug & DEB_HEADER)
+            {
                 dumpheader(art_buf);
+            }
 #endif
             if (g_htype[g_in_header].flags & HT_HIDE)
             {

libtrn/intrp.cpp

@@ -71,7 +71,9 @@ void intrp_init(char *tcbuf, int tcbuf_len)
         struct passwd* pwd = getpwnam(NEWS_ADMIN);
 
         if (pwd != nullptr)
+        {
             g_newsuid = pwd->pw_uid;
+        }
 #else
 #ifdef TILDENAME
         char tildenews[2+sizeof NEWS_ADMIN];
@@ -135,7 +137,9 @@ static char *skipinterp(char *pattern, const char *stoppers)
 {
 #ifdef DEBUG
     if (debug & DEB_INTRP)
+    {
         printf("skipinterp %s (till %s)\n",pattern,stoppers?stoppers:"");
+    }
 #endif
 
     while (*pattern && (!stoppers || !strchr(stoppers,*pattern))) {