Cosmetics.

diff --git a/src/client/fnlist.h b/src/client/fnlist.h
index 8fb8f7dd6cc6687f0e65217e25ea6f49c35679d3..908c7a75569553c8386ae7be6999d0ac46927d8e 100644 (file)
--- a/src/client/fnlist.h
+++ b/src/client/fnlist.h
@@ -41,4 +41,4 @@ struct fn {
     int value;
 };
 
-#endif /* _FNLIST_H_ */
+#endif /* _FNLIST_H_ */

diff --git a/src/client/misc.h b/src/client/misc.h
index 8290f9f8f45da3cbb1af1831bb3d7e7303062ef1..fac701776f5ea9568e45a725a10702091e8b5e7d 100644 (file)
--- a/src/client/misc.h
+++ b/src/client/misc.h
@@ -62,7 +62,7 @@ typedef u_char natid;         /* also change NSC_NATID in nsc.h */
 #if !defined(aix) && !defined(sgi)
 #ifndef ultrix                 /* already defined in ultrix */
 typedef char s_char;           /* change to signed char for aix */
-#endif /* ultrix */
+#endif /* ultrix */
 #else
 typedef signed char s_char;
 #endif /* !aix && !sgi */

diff --git a/src/client/queue.h b/src/client/queue.h
index 5fe1c44032f1523b5098188bddd88519e713c1f9..bb01ae3570a8b6401abdcaed078e0c701f08a005 100644 (file)
--- a/src/client/queue.h
+++ b/src/client/queue.h
@@ -41,4 +41,4 @@ struct qelem {
     struct qelem *q_back;
 };
 
-#endif /* _QUEUE */
+#endif /* _QUEUE */

diff --git a/src/lib/commands/buil.c b/src/lib/commands/buil.c
index 23e11fa7abd3cdeb43e4adf6ad2a6b00b4aafb18..9fb37fa5e84d8a327a8b1d3f8452d0f10c484589 100644 (file)
--- a/src/lib/commands/buil.c
+++ b/src/lib/commands/buil.c
@@ -743,9 +743,7 @@ build_bridge(register struct sctstr *sp, register int *vec)
           xyas(sp->sct_x, sp->sct_y, player->cnum));
        nav_map(sp->sct_x, sp->sct_y, 1);
     }
-    if (!
-       (p =
-        getstarg(player->argp[3], "build span in what direction? ", buf))
+    if (!(p = getstarg(player->argp[3], "build span in what direction? ", buf))
        || !*p) {
        return 0;
     }
@@ -1071,9 +1069,7 @@ build_tower(register struct sctstr *sp, register int *vec)
        pr("Building from %s\n", xyas(sp->sct_x, sp->sct_y, player->cnum));
        nav_map(sp->sct_x, sp->sct_y, 1);
     }
-    if (!
-       (p =
-        getstarg(player->argp[3], "build tower in what direction? ", buf))
+    if (!(p = getstarg(player->argp[3], "build tower in what direction? ", buf))
        || !*p) {
        return 0;
     }

diff --git a/src/lib/commands/sail.c b/src/lib/commands/sail.c
index de602b509dea19d066d6831cdc2bd2a4f102b96d..19a9215ba8d65d7b939ab2ee127fc9c1015d7ad9 100644 (file)
--- a/src/lib/commands/sail.c
+++ b/src/lib/commands/sail.c
@@ -171,7 +171,7 @@ sail(void)
     cp = player->argp[2];
     if ((*player->argp[0] == 'q') /*qsail command */ ||(cp && *cp == 'q')) {
        return (show_sail(&nstr));
-    } else if (*player->argp[0] == 'u' /*unsail command */ 
+    } else if (*player->argp[0] == 'u' /*unsail command */
               || (cp && *cp == '-')) {
        return (cmd_unsail_ship(&nstr));
     } else

diff --git a/src/lib/global/dir.c b/src/lib/global/dir.c
index 44737db84625f1ba72616cb515906ab34b44dc83..f0b29755bae4ff1520ccdd7be52b4d7dd649738d 100644 (file)
--- a/src/lib/global/dir.c
+++ b/src/lib/global/dir.c
@@ -52,7 +52,7 @@ s_char dirch[] = {
 /* must agree with dirch[] and DIR_ defines */
 int diroff[][2] = {
     {0, 0}, {1, -1}, {2, 0}, {1, 1}, {-1, 1}, {-2, 0}, {-1, -1}, {0, 0},
-       {0, 0}
+    {0, 0}
 };
 
 /* this maps a character from a to z into the diroff mappings.  It

diff --git a/src/lib/global/misc.c b/src/lib/global/misc.c
index eee38ced73efb9c6208acf897a4e15dcede8e7df..dbfc0a951a8e1238087a544146e1499b6b5fb547 100644 (file)
--- a/src/lib/global/misc.c
+++ b/src/lib/global/misc.c
@@ -40,7 +40,7 @@ s_char *effadv_list[] = {
 /* must follow nation relation defines in nat.h */
 s_char *relates[] = {
     "At War", "Sitzkrieg", "Mobilizing", "Hostile", "Neutral", "Friendly",
-       "Allied"
+    "Allied"
 };
 
 /* must follow reject flags defined in nat.h */

diff --git a/src/lib/player/empmod.c b/src/lib/player/empmod.c
index 06ee64d2c3ed89d1878aa01f6bad32e4bad94a85..a1f2ed94f3cd4f8e6c46f9450b9422eb5897bfd7 100644 (file)
--- a/src/lib/player/empmod.c
+++ b/src/lib/player/empmod.c
@@ -148,8 +148,8 @@ extern int grin();
 extern int shar();
 extern int sail();             /* Forsman's hacks */
 extern int foll();
-/**/ extern int mobq();
-/**/ extern int name();
+extern int mobq();
+extern int name();
 extern int range();
 extern int zdon();
 extern int fuel();
@@ -287,7 +287,8 @@ struct cmndstr player_coms[] = {
     {"drop <cargo-PLANES> <fighter-PLANES> <ap-SECT> <PATH|DESTINATION> <COMM>", 1, drop, C_MOD, NORM + MONEY + CAP},
     {"dump <SECTS> [<fields>]", 0, dump, 0, NORM},
     {"echo [<string>]", 0, echo, 0, NORM},
-    {"edit <country|land|unit|ship|plane|nuke> [<KEY> <VALUE>]...", 0, edit, C_MOD, GOD},
+    {"edit <country|land|unit|ship|plane|nuke> [<KEY> <VALUE>]...", 0,
+     edit, C_MOD, GOD},
     {"enable", 0, enab, C_MOD, GOD},
     {"enlist <SECTS> <NUM>", 2, enli, C_MOD, NORM + MONEY + CAP},
     {"execute <INPUT FILE>", 0, execute, 0, VIS},

diff --git a/src/lib/subs/getele.c b/src/lib/subs/getele.c
index e50a4844adfbd1255bd7e39b31f54c2a7ed448f4..cd44a7c960691a4c60a951860917006f8eecd0bf 100644 (file)
--- a/src/lib/subs/getele.c
+++ b/src/lib/subs/getele.c
@@ -76,8 +76,8 @@ getele(s_char *nation, s_char *buf)
            pr("%s", buf);
            continue;
        }
-       if (buffer[0] == '.' && ((buffer[1] == 0) ||
-                                (buffer[1] == '\n')
+       if (buffer[0] == '.' && ((buffer[1] == 0)
+                                || (buffer[1] == '\n')
                                 || (buffer[1] == '\r')))
            break;
        len = strlen(buffer);

diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c
index d22734975c8faaae43fe65a51598954456254f19..285cd5fe36fc906aace770d97f1f25040c0f4d44 100644 (file)
--- a/src/lib/subs/mission.c
+++ b/src/lib/subs/mission.c
@@ -430,9 +430,6 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
 {
     extern int land_max_interdiction_range;
     extern int ship_max_interdiction_range;
-    s_char *mission_name(short int mission), *nameofitem(s_char *buf,
-                                                        struct genitem
-                                                        *gp, int type);
     struct emp_qelem *qp, missiles, bombers, escorts, airp, b, e;
     struct emp_qelem *newqp;
     struct genlist *glp;

diff --git a/src/server/update.c b/src/server/update.c
index f89817e301a07e814d0422708d925ab39fd6724d..f519dad8ba6371c42f1d939037863f0c6ff91e6a 100644 (file)
--- a/src/server/update.c
+++ b/src/server/update.c
@@ -144,7 +144,7 @@ void *argv;
        dp = player_new(0, 0);
        stacksize = 100000 +
 /* finish_sects */ WORLD_X * WORLD_Y * (2 * sizeof(double) +
-                                                   sizeof(s_char *));
+                                       sizeof(s_char *));
 
        empth_create(PP_UPDATE, update_main, stacksize, 0,
                     "UpdateRun", "Updates the world", dp);