Permalink
Browse files

Rename `reboot` to `should_reboot`.

Avoids name conflict with `reboot()` system call.
  • Loading branch information...
1 parent 1d1458b commit c3d731b77d20c1ce11b4250b073f070ac56fe9be @jonm committed Oct 10, 2015
Showing with 7 additions and 7 deletions.
  1. +2 −2 src/act.wizard.c
  2. +1 −1 src/comm.c
  3. +2 −2 src/modify.c
  4. +2 −2 src/signals.c
View
@@ -1843,7 +1843,7 @@ void do_shutdow(struct char_data *ch, char *argument, int cmd)
void do_shutdown(struct char_data *ch, char *argument, int cmd)
{
- extern int mudshutdown, reboot;
+ extern int mudshutdown, should_reboot;
char buf[100], arg[MAX_INPUT_LENGTH];
if (IS_NPC(ch))
@@ -1860,7 +1860,7 @@ void do_shutdown(struct char_data *ch, char *argument, int cmd)
sprintf(buf, "Reboot by %s.", GET_NAME(ch));
send_to_all(buf);
log_msg(buf);
- mudshutdown = reboot = 1;
+ mudshutdown = should_reboot = 1;
} else
send_to_char("Go shut down someone your own size.\n\r", ch);
}
View
@@ -58,7 +58,7 @@ struct descriptor_data *descriptor_list, *next_to_process;
int lawful = 0; /* work like the game regulator */
int slow_death = 0; /* Shut her down, Martha, she's sucking mud */
int mudshutdown = 0; /* clean shutdown */
-int reboot = 0; /* reboot the game after a shutdown */
+int should_reboot = 0; /* reboot the game after a shutdown */
int no_specials = 0; /* Suppress ass. of special routines */
long Uptime; /* time that the game has been up */
View
@@ -934,7 +934,7 @@ void check_reboot()
char dummy;
FILE *boot;
- extern int mudshutdown, reboot;
+ extern int mudshutdown, should_reboot;
tc = time(0);
t_info = localtime(&tc);
@@ -962,7 +962,7 @@ void check_reboot()
}
send_to_all("Automatic reboot. Come back in a little while.\n\r");
- mudshutdown = reboot = 1;
+ mudshutdown = should_reboot = 1;
}
else if (t_info->tm_min > 40)
send_to_all("ATTENTION: DikuMUD will reboot in 10 minutes.\n\r");
View
@@ -73,7 +73,7 @@ int shutdown_request()
int hupsig()
{
int i;
- extern int mudshutdown, reboot;
+ extern int mudshutdown, should_reboot;
log_msg("Received SIGHUP, SIGINT, or SIGTERM. Shutting down");
@@ -82,7 +82,7 @@ int hupsig()
for (i=0;i<30;i++) {
SaveTheWorld();
}
- mudshutdown = reboot = 1;
+ mudshutdown = should_reboot = 1;
}
int logsig()

0 comments on commit c3d731b

Please sign in to comment.