From a9653c475bee9d0b0d9a4693641e6dad6a4c8e3c Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 17 Sep 2008 19:29:42 -0400 Subject: [PATCH] Fix whitespace: space before tab --- doc/xdump | 2 +- include/file.h | 2 +- include/nat.h | 6 +++--- info/Quick-ref.t | 2 +- info/TROFF.MAC | 2 +- src/lib/commands/fina.c | 2 +- src/lib/commands/mine.c | 2 +- src/lib/commands/nati.c | 2 +- src/lib/commands/news.c | 2 +- src/lib/commands/turn.c | 2 +- src/lib/global/constants.c | 2 +- src/lib/player/accept.c | 6 +++--- src/lib/player/player.c | 2 +- src/lib/subs/supply.c | 6 +++--- src/lib/subs/wu.c | 2 +- src/lib/w32/service.c | 4 ++-- src/util/files.c | 10 +++++----- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/doc/xdump b/doc/xdump index 8c1705dc3..e0adf04b5 100644 --- 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 ] - identifier space timestamp newline ; + identifier space timestamp newline ; 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 c0eee6c1f..5d5fc9206 100644 --- 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 */ -#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 diff --git a/include/nat.h b/include/nat.h index 4272c9953..ba6268fbc 100644 --- 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 */ -#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 */ diff --git a/info/Quick-ref.t b/info/Quick-ref.t index 652436ef4..564ffb0ea 100644 --- 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 - 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 diff --git a/info/TROFF.MAC b/info/TROFF.MAC index 56b279d7f..82e65a173 100644 --- a/info/TROFF.MAC +++ b/info/TROFF.MAC @@ -36,5 +36,5 @@ .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 diff --git a/src/lib/commands/fina.c b/src/lib/commands/fina.c index fca4f886d..680afaf10 100644 --- 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_SYN; + return RET_SYN; (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 b220895fc..fd8e619eb 100644 --- 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) - pr(" but is now out of supply\n"); + pr(" but is now out of supply\n"); else pr("\n"); } else diff --git a/src/lib/commands/nati.c b/src/lib/commands/nati.c index 4e42ead0f..d27b31fc7 100644 --- 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 - natp = getnatp(player->cnum); + natp = getnatp(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 6abf9d676..7490e38fe 100644 --- 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)) - 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); diff --git a/src/lib/commands/turn.c b/src/lib/commands/turn.c index 006700046..c35703c17 100644 --- a/src/lib/commands/turn.c +++ b/src/lib/commands/turn.c @@ -114,7 +114,7 @@ turn(void) 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; diff --git a/src/lib/global/constants.c b/src/lib/global/constants.c index e86aa2752..db8c6103e 100644 --- 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 - * (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; diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c index a2dce0ed3..116e69b92 100644 --- 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); - close(ns); - continue; - } + close(ns); + continue; + } #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 e62fd150d..16664abcc 100644 --- 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) { - if (errno == ENOENT) + if (errno == ENOENT) 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 436248d76..a32b379d7 100644 --- 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 - * 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 - * (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 */ diff --git a/src/lib/subs/wu.c b/src/lib/subs/wu.c index 65c200969..6b43bf30e 100644 --- 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 - write_ok = 1; + write_ok = 1; 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 7588f4722..8cb654996 100644 --- 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, - 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 */ diff --git a/src/util/files.c b/src/util/files.c index f3fe5514b..43ae38781 100644 --- a/src/util/files.c +++ b/src/util/files.c @@ -121,12 +121,12 @@ main(int argc, char *argv[]) } 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); - 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)) -- 2.43.0