License upgrade to GPL version 3 or later

[empserver] / src / lib / subs / show.c

diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c
index 99703eae51457815dee2eb10e42b82fa9dff5a90..199a3261d7764c576612fa2b1dcb8fac92d0ccc6 100644 (file)
--- a/src/lib/subs/show.c
+++ b/src/lib/subs/show.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -605,7 +604,7 @@ show_news(int tlev)
        if (rpt[i].r_newspage == N_NOTUSED)
            continue;
        pr("%-2d %-20.20s %4d\n", rpt[i].r_uid,
-           page_headings[rpt[i].r_newspage].name, rpt[i].r_good_will);
+          page_headings[rpt[i].r_newspage].name, rpt[i].r_good_will);
        for (j = 0; j < NUM_RPTS; j++)
            pr("    %s\n", rpt[i].r_newstory[j]);
     }
@@ -686,12 +685,12 @@ fmttime2822(time_t t)
        (time->tm_isdst ? tzi.DaylightBias : tzi.StandardBias));
 
     nn = _snprintf(buf + n, sizeof(buf) - n, " %+03d%02d",
-       time_offset/60, abs(time_offset) % 60);
+                  time_offset / 60, abs(time_offset) % 60);
     if (CANT_HAPPEN(nn <= 0 || nn + n >= sizeof(buf)))
        buf[0] = 0;
 #else
     size_t n = strftime(buf, sizeof(buf), "%a, %d %b %Y %T %z",
-                    localtime(&t));
+                       localtime(&t));
     if (CANT_HAPPEN(n == 0))
        buf[0] = 0;
 #endif