(acce, rea, rela, snxtitem): Pass NULL as prompt when the prompt won't

be used.

diff --git a/src/lib/commands/acce.c b/src/lib/commands/acce.c
index 82038786e94bd15de8bda82bab85e1e12034dc20..019d414ffcabff0957de85944779abf286e8c5e6 100644 (file)
--- a/src/lib/commands/acce.c
+++ b/src/lib/commands/acce.c
@@ -58,7 +58,7 @@ acce(void)
     if (player->argp[1] == 0) {
        natp = getnatp(player->cnum);
     } else {
-       if (!(natp = natargp(player->argp[1], "Which country? ")))
+       if (!(natp = natargp(player->argp[1], NULL)))
            return RET_SYN;
     }
     as = natp->nat_cnum;

diff --git a/src/lib/commands/rea.c b/src/lib/commands/rea.c
index 0f901e07662d07aefa1337a370aff067466e93d8..f9d9b608d5f9f5ed3b94484ecd7cecf202d6aadc 100644 (file)
--- a/src/lib/commands/rea.c
+++ b/src/lib/commands/rea.c
@@ -100,7 +100,7 @@ rea(void)
        if (player->god && player->argp[1] &&
            (mineq(player->argp[1], "yes") == ME_MISMATCH) &&
            (mineq(player->argp[1], "no") == ME_MISMATCH)) {
-           if ((n = natarg(player->argp[1], "")) < 0)
+           if ((n = natarg(player->argp[1], NULL)) < 0)
                return RET_SYN;
            num = n;
            may_delete = 0;

diff --git a/src/lib/commands/rela.c b/src/lib/commands/rela.c
index f6f65c94fba9554c0fccc2f33fb62215762137fa..76ea1485dff0f143a1a761e1f9edaec21ce998cf 100644 (file)
--- a/src/lib/commands/rela.c
+++ b/src/lib/commands/rela.c
@@ -58,7 +58,7 @@ rela(void)
     if (player->argp[1] == 0)
        as = player->cnum;
     else {
-       if ((n = natarg(player->argp[1], "Which country? ")) < 0)
+       if ((n = natarg(player->argp[1], NULL)) < 0)
            return RET_SYN;
        as = (natid)n;
     }

diff --git a/src/lib/subs/snxtitem.c b/src/lib/subs/snxtitem.c
index 7d261a754f52ff11b74597c50179ab2a603a34ff..7f81da6dbff2c3b203c0faa27ead2bb5392ad0ac 100644 (file)
--- a/src/lib/subs/snxtitem.c
+++ b/src/lib/subs/snxtitem.c
@@ -72,7 +72,7 @@ snxtitem(struct nstr_item *np, int type, s_char *str)
        return 0;
     }
     if (type == EF_NATION && isalpha(*str)) {
-       sprintf(natnumber, "%d", natarg(str, ""));
+       sprintf(natnumber, "%d", natarg(str, NULL));
        str = natnumber;
     }
     flags = ef_flags(type);