Fix whitespace: space before tab

diff --git a/doc/xdump b/doc/xdump
index 8c1705dc3e4d12143e2e0248eb165418abb398d1..e0adf04b5eee59b99179cd1039ba571eff6e98ad 100644 (file)
--- a/doc/xdump
+++ b/doc/xdump
@@ -172,7 +172,7 @@ use '-' in meta-identifiers and omit the concatenation symbol ','.
 
     table = header { record } footer ;
     header = "XDUMP" space [ "meta" space ]
 
     table = header { record } footer ;
     header = "XDUMP" space [ "meta" space ]

-            identifier space timestamp newline ;
+            identifier space timestamp newline ;

     identifier = id-chr { id-chr } ;
     id-char = ? ASCII characters 33..126 except '"#()<>=' ? ;
     timestamp = intnum ;
     identifier = id-chr { id-chr } ;
     id-char = ? ASCII characters 33..126 except '"#()<>=' ? ;
     timestamp = intnum ;

diff --git a/include/file.h b/include/file.h
index c0eee6c1f3bc3921cc0e9911951b751387c9eccf..5d5fc92067572bb4449bcaf414576a97a1a51b69 100644 (file)
--- a/include/file.h
+++ b/include/file.h
@@ -98,7 +98,7 @@ struct emptypedstr {
  */
 /* Immutable flags, fixed at compile-time */
 /* Dereferencing entry address cast to struct emptypedstr * is safe */
  */
 /* Immutable flags, fixed at compile-time */
 /* Dereferencing entry address cast to struct emptypedstr * is safe */

-#define EFF_TYPED      bit(0)
+#define EFF_TYPED      bit(0)

 /*
  * EFF_XY / EFF_OWNER / EFF_GROUP assert that coordinates / owner /
  * group of such a table's entries can be safely obtained by
 /*
  * EFF_XY / EFF_OWNER / EFF_GROUP assert that coordinates / owner /
  * group of such a table's entries can be safely obtained by

diff --git a/include/nat.h b/include/nat.h
index 4272c99535361b52dfc57275893d666c0b8621d8..ba6268fbcd78c77d7867225d782d6ba40a6f8045 100644 (file)
--- a/include/nat.h
+++ b/include/nat.h
@@ -182,9 +182,9 @@ extern struct natstr *nat_reset(struct natstr *, enum nat_status, coord, coord);
 extern int grant_btus(struct natstr *, int );
 
 /* nation flags */
 extern int grant_btus(struct natstr *, int );
 
 /* nation flags */

-#define NF_INFORM      bit(0)  /* Inform me of telegrams right away */
-#define NF_FLASH       bit(1)  /* Allow other players to flash me (sicko :) */
-#define NF_BEEP        bit(2)  /* Make beeping sounds when appropriate */
+#define NF_INFORM      bit(0)  /* Inform me of telegrams right away */
+#define NF_FLASH       bit(1)  /* Allow other players to flash me (sicko :) */
+#define NF_BEEP                bit(2)  /* Make beeping sounds when appropriate */

 #define NF_COASTWATCH  bit(3)  /* Turn auto-coastwatch on */
 #define NF_SONAR       bit(4)  /* Turn auto-sonar on */
 #define NF_TECHLISTS    bit(5) /* Sort lists by tech not type */
 #define NF_COASTWATCH  bit(3)  /* Turn auto-coastwatch on */
 #define NF_SONAR       bit(4)  /* Turn auto-sonar on */
 #define NF_TECHLISTS    bit(5) /* Sort lists by tech not type */

diff --git a/info/Quick-ref.t b/info/Quick-ref.t
index 652436ef4eb085dbbf7f63b45bafb91311f55754..564ffb0ea321183c615ca6904d0597c7eb974fe9 100644 (file)
--- a/info/Quick-ref.t
+++ b/info/Quick-ref.t
@@ -10,7 +10,7 @@ Sector-types:
     /  wasteland             g  gold mine              n  nuclear plant
     -  wilderness            h  harbor                 l  library/school
     c  capital/city          w  warehouse              e  enlistment center
     /  wasteland             g  gold mine              n  nuclear plant
     -  wilderness            h  harbor                 l  library/school
     c  capital/city          w  warehouse              e  enlistment center

-    p  park                  u  uranium mine                  !  headquarters
+    p  park                  u  uranium mine           !  headquarters

     COMMUNICATIONS           *  airfield               
     +  highway               a  agribusiness           FINANCIAL
     )  radar installation    o  oil field              b  bank
     COMMUNICATIONS           *  airfield               
     +  highway               a  agribusiness           FINANCIAL
     )  radar installation    o  oil field              b  bank

diff --git a/info/TROFF.MAC b/info/TROFF.MAC
index 56b279d7f22b29192d004b3c63c374dec11a11b2..82e65a17363d7ef31e7675cf0676642e2350a37b 100644 (file)
--- a/info/TROFF.MAC
+++ b/info/TROFF.MAC
@@ -36,5 +36,5 @@
 .lt 5i                  \" Title length
 .po 0.9i                \" Page offset
 .ev
 .lt 5i                  \" Title length
 .po 0.9i                \" Page offset
 .ev

-\" .so INFO.MAC        \" Read in INFO.MAC macros
+\" .so INFO.MAC                \" Read in INFO.MAC macros

 \" except that's done by make now
 \" except that's done by make now

diff --git a/src/lib/commands/fina.c b/src/lib/commands/fina.c
index fca4f886d1f9d3ca92f67acd579824c13f7f26e1..680afaf10d9410bc5c35bcf28cef16214f601e2d 100644 (file)
--- a/src/lib/commands/fina.c
+++ b/src/lib/commands/fina.c
@@ -54,7 +54,7 @@ fina(void)
        return RET_FAIL;
     }
     if (!snxtitem(&ni, EF_LOAN, "*", NULL))
        return RET_FAIL;
     }
     if (!snxtitem(&ni, EF_LOAN, "*", NULL))

-       return RET_SYN;
+       return RET_SYN;

     (void)time(&now);
     pr("\n");
     pr("             -= Empire Financial Status Report =- \n");
     (void)time(&now);
     pr("\n");
     pr("             -= Empire Financial Status Report =- \n");

diff --git a/src/lib/commands/mine.c b/src/lib/commands/mine.c
index b220895fc99671c90a4ecb8a388b397e05a19dd4..fd8e619ebed3a720db496ddff84934939d61c0ee 100644 (file)
--- a/src/lib/commands/mine.c
+++ b/src/lib/commands/mine.c
@@ -155,7 +155,7 @@ landmine(void)
               prland(&land), total_mines_laid,
               xyas(sect.sct_x, sect.sct_y, land.lnd_own));
            if (!shells)
               prland(&land), total_mines_laid,
               xyas(sect.sct_x, sect.sct_y, land.lnd_own));
            if (!shells)

-               pr(" but is now out of supply\n");
+               pr(" but is now out of supply\n");

            else
                pr("\n");
        } else
            else
                pr("\n");
        } else

diff --git a/src/lib/commands/nati.c b/src/lib/commands/nati.c
index 4e42ead0fa0a4d5535c69e6c26c85c9e2d9129ed..d27b31fc7159077ce9408409521146ef191f44b3 100644 (file)
--- a/src/lib/commands/nati.c
+++ b/src/lib/commands/nati.c
@@ -52,7 +52,7 @@ nati(void)
        if (!(natp = natargp(player->argp[1], NULL)))
            return RET_SYN;
     } else
        if (!(natp = natargp(player->argp[1], NULL)))
            return RET_SYN;
     } else

-       natp = getnatp(player->cnum);
+       natp = getnatp(player->cnum);

 
     cnum = natp->nat_cnum;
     if (!player->god && cnum != player->cnum) {
 
     cnum = natp->nat_cnum;
     if (!player->god && cnum != player->cnum) {

diff --git a/src/lib/commands/news.c b/src/lib/commands/news.c
index 6abf9d6769cc055406887347321191b78e3ee6d5..7490e38fe580b82dd8bb40ab1f50c6765fd41260 100644 (file)
--- a/src/lib/commands/news.c
+++ b/src/lib/commands/news.c
@@ -62,7 +62,7 @@ news(void)
     char *verb;
 
     if (!snxtitem(&nstr, EF_NEWS, "*", NULL))
     char *verb;
 
     if (!snxtitem(&nstr, EF_NEWS, "*", NULL))

-       return RET_SYN;
+       return RET_SYN;

     memset(page_has_news, 0, sizeof(page_has_news));
     memset(sectors_taken, 0, sizeof(sectors_taken));
     (void)time(&now);
     memset(page_has_news, 0, sizeof(page_has_news));
     memset(sectors_taken, 0, sizeof(sectors_taken));
     (void)time(&now);

diff --git a/src/lib/commands/turn.c b/src/lib/commands/turn.c
index 006700046b38cbeeec5290e0a2b7aa64c0ae7ca8..c35703c17d93fd544611b553552d65ebe908e072 100644 (file)
--- a/src/lib/commands/turn.c
+++ b/src/lib/commands/turn.c
@@ -114,7 +114,7 @@ turn(void)
        return RET_FAIL;
     }
     if (fclose(fptr)) {
        return RET_FAIL;
     }
     if (fclose(fptr)) {

-       pr("Something went wrong closing the message.\n");
+       pr("Something went wrong closing the message.\n");

        logerror("Could not properly close message file (%s).\n",
            msgfilepath);
        return RET_FAIL;
        logerror("Could not properly close message file (%s).\n",
            msgfilepath);
        return RET_FAIL;

diff --git a/src/lib/global/constants.c b/src/lib/global/constants.c
index e86aa275209e30bf6bf29616bce276925732c76e..db8c6103e8a8c7ef3e1832db98ae66ffbcf51086 100644 (file)
--- a/src/lib/global/constants.c
+++ b/src/lib/global/constants.c
@@ -163,7 +163,7 @@ double hap_cons = 600000.0;
 double edu_cons = 600000.0;
 
 /* hap and edu avg mean that the weight on current happiness is
 double edu_cons = 600000.0;
 
 /* hap and edu avg mean that the weight on current happiness is

- *  (cur_hap * hap_avg + hap_prod * etu) / (hap_avg + etu);            */
+ *  (cur_hap * hap_avg + hap_prod * etu) / (hap_avg + etu); */

 float hap_avg = 16.0 * 3.0;
 float edu_avg = 16.0 * 12.0;
 
 float hap_avg = 16.0 * 3.0;
 float edu_avg = 16.0 * 12.0;
 

diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c
index a2dce0ed339f14bf43e87d502830dab5d2fb5455..116e69b92e7e08b237f079dbb5a58ca504600649 100644 (file)
--- a/src/lib/player/accept.c
+++ b/src/lib/player/accept.c
@@ -186,9 +186,9 @@ player_accept(void *unused)
        np = player_new(ns);
        if (!np) {
            logerror("can't create player for fd %d", ns);
        np = player_new(ns);
        if (!np) {
            logerror("can't create player for fd %d", ns);

-           close(ns);
-           continue;
-       }
+           close(ns);
+           continue;
+       }

 #ifdef HAVE_GETADDRINFO
        inaddr = sap->sa_family == AF_INET
            ? (void *)&((struct sockaddr_in *)sap)->sin_addr
 #ifdef HAVE_GETADDRINFO
        inaddr = sap->sa_family == AF_INET
            ? (void *)&((struct sockaddr_in *)sap)->sin_addr

diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index e62fd150d0dec66fc75878be4ba5e3bb28c6c192..16664abcc108540aa711b7c1ebc591fe970b3ea5 100644 (file)
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -299,7 +299,7 @@ show_motd(void)
     char buf[MAXTELSIZE + 1];  /* UTF-8 */
 
     if ((motd_fp = fopen(motdfil, "rb")) == NULL) {
     char buf[MAXTELSIZE + 1];  /* UTF-8 */
 
     if ((motd_fp = fopen(motdfil, "rb")) == NULL) {

-       if (errno == ENOENT)
+       if (errno == ENOENT)

            return RET_OK;
        else {
            pr ("Could not open motd.\n");
            return RET_OK;
        else {
            pr ("Could not open motd.\n");

diff --git a/src/lib/subs/supply.c b/src/lib/subs/supply.c
index 436248d7602b0434beb7575588a909f9e0de2d55..a32b379d72bb5d193cd807d6323cff24fd16a6c1 100644 (file)
--- a/src/lib/subs/supply.c
+++ b/src/lib/subs/supply.c
@@ -48,14 +48,14 @@ static int s_commod(int, int, int, i_type, int, int);
 
 /*
  * We want to get enough guns to be maxed out, enough shells to
 
 /*
  * We want to get enough guns to be maxed out, enough shells to

- *     fire once, one update's worth of food.
+ *     fire once, one update's worth of food.

  *
  * Firts, try to forage in the sector
  * Second look for a warehouse or headquarters to leech
  * Third, look for a ship we own in a harbor
  * Fourth, look for supplies in a supply unit we own
  *
  * Firts, try to forage in the sector
  * Second look for a warehouse or headquarters to leech
  * Third, look for a ship we own in a harbor
  * Fourth, look for supplies in a supply unit we own

- *             (one good reason to do this last is that the supply
- *              unit will then call resupply, taking more time)
+ *             (one good reason to do this last is that the supply
+ *              unit will then call resupply, taking more time)

  *
  * May want to put code to resupply with SAMs here, later --ts
  */
  *
  * May want to put code to resupply with SAMs here, later --ts
  */

diff --git a/src/lib/subs/wu.c b/src/lib/subs/wu.c
index 65c200969cd795a2fd7cf2eb1020e5d6e114f412..6b43bf30e3b2059fd7d08e88d435be3f0abc4926 100644 (file)
--- a/src/lib/subs/wu.c
+++ b/src/lib/subs/wu.c
@@ -158,7 +158,7 @@ typed_wu(natid from, natid to, char *message, int type)
     if (writev(fd, iov, 2) < (int)(iov[0].iov_len + iov[1].iov_len)) {
        logerror("telegram 'write' to #%d failed", to);
     } else
     if (writev(fd, iov, 2) < (int)(iov[0].iov_len + iov[1].iov_len)) {
        logerror("telegram 'write' to #%d failed", to);
     } else

-       write_ok = 1;
+       write_ok = 1;

 
     if (close(fd) == -1) {
        logerror("telegram 'write' to #%d failed to close.", to);
 
     if (close(fd) == -1) {
        logerror("telegram 'write' to #%d failed to close.", to);

diff --git a/src/lib/w32/service.c b/src/lib/w32/service.c
index 7588f472222f305a1463579e8372fbff88000bc4..8cb654996c13e1da0bfa9f6023f82dc0d01ec9c7 100644 (file)
--- a/src/lib/w32/service.c
+++ b/src/lib/w32/service.c
@@ -62,8 +62,8 @@ install_service(char *program_name, char *service_name, char *config_file)
     }
 
     schService = CreateService(schSCManager,
     }
 
     schService = CreateService(schSCManager,

-       service_name,
-       service_name,                   /* service name to display */
+       service_name,
+       service_name,                   /* service name to display */

         SERVICE_ALL_ACCESS,            /* desired access */
         SERVICE_WIN32_OWN_PROCESS,     /* service type */
         SERVICE_AUTO_START,            /* start type */
         SERVICE_ALL_ACCESS,            /* desired access */
         SERVICE_WIN32_OWN_PROCESS,     /* service type */
         SERVICE_AUTO_START,            /* start type */

diff --git a/src/util/files.c b/src/util/files.c
index f3fe5514b9f20ddd39f6ec22e4531d000d10c6fc..43ae38781de0a8a3616917ce8e3ee8c17534d689 100644 (file)
--- a/src/util/files.c
+++ b/src/util/files.c
@@ -121,12 +121,12 @@ main(int argc, char *argv[])
     }
 
     if (!force) {
     }
 
     if (!force) {

-       printf("WARNING: this blasts the existing game in %s (if any)\n",
+       printf("WARNING: this blasts the existing game in %s (if any)\n",

               gamedir);
               gamedir);

-       printf("continue? ");
-       fgets(buf, sizeof(buf), stdin);
-       if (*buf != 'y' && *buf != 'Y')
-           exit(1);
+       printf("continue? ");
+       fgets(buf, sizeof(buf), stdin);
+       if (*buf != 'y' && *buf != 'Y')
+           exit(1);

     }
     for (i = 0; i < EF_MAX; i++) {
        if (!EF_IS_GAME_STATE(i))
     }
     for (i = 0; i < EF_MAX; i++) {
        if (!EF_IS_GAME_STATE(i))