Use not f_name variable but __func__, standardize function name writing.

[plomrogue] / src / client / main.c

diff --git a/src/client/main.c b/src/client/main.c
index a0cb82c6b93f22e8db4313661b729c9d52bdf555..9c6a72ac3f19a3c8942d2c89a68955b703935ee7 100644 (file)
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -1,12 +1,13 @@
 /* main.c */
 
+#define _POSIX_C_SOURCE 1 /* sigaction, sigaction() */
+#define _DARWIN_C_SOURCE 1 /* SIGWINCH on OS X */
 #include <ncurses.h> /* keypad() */
-#include <signal.h> /* struct sigaction, sigaction() */
+#include <signal.h> /* SIGWINCH, sigaction, sigaction() */
 #include <stddef.h> /* NULL */
 #include <stdlib.h> /* exit() */
 #include <string.h> /* memset() */
 #include <unistd.h> /* access() */
-#include "../common/err_try_fgets.h" /* set_err_try_fgets_delim() */
 #include "../common/readwrite.h" /* try_fopen() */
 #include "../common/rexit.h" /* set_cleanup_func(), exit_trouble(),exit_err() */
 #include "cleanup.h" /* cleanup(), set_cleanup_flag() */
@@ -24,14 +25,10 @@ struct World world;
 
 int main(int argc, char * argv[])
 {
-    char * f_name = "main()";
-
     /* Declare hard-coded paths and values here. */
     world.path_commands    = "confclient/commands";
     world.path_interface   = "confclient/interface_conf";
     world.winDB.legal_ids  = "012ciklm";
-    world.delim            = "%\n";
-    set_err_try_fgets_delim(world.delim);
     char * path_server_in  = "server/in";
     char * path_server_out = "server/out";
 
@@ -53,18 +50,19 @@ int main(int argc, char * argv[])
     keypad(world.winDB.t_screen, TRUE);
     init_command_db();      /* The command DB needs to be initialized before  */
     load_interface_conf();  /* the interface, whose keybindings depend on it. */
+    world.focus_each_turn = 1;
 
     /* Set handler for terminal window resizing. */
     struct sigaction act;
     memset(&act, 0, sizeof(act));
     act.sa_handler = &winch_called;
-    exit_trouble(sigaction(SIGWINCH, &act, NULL), f_name, "sigaction()");
+    exit_trouble(sigaction(SIGWINCH, &act, NULL), __func__, "sigaction");
 
     /* Open file streams for communicating with the server. */
     exit_err(access(path_server_in, F_OK), "No server input file found.");
-    world.file_server_in = try_fopen(path_server_in, "a", f_name);
+    world.file_server_in = try_fopen(path_server_in, "a", __func__);
     set_cleanup_flag(CLEANUP_SERVER_IN);
-    world.file_server_out = try_fopen(path_server_out, "r", f_name);
+    world.file_server_out = try_fopen(path_server_out, "r", __func__);
     set_cleanup_flag(CLEANUP_SERVER_OUT);
 
     /* This is where most everything happens. */
@@ -72,6 +70,6 @@ int main(int argc, char * argv[])
 
     /* Leave properly. */
     cleanup();
-    printf("%s\n", quit_msg);
+    exit_trouble(printf("%s\n", quit_msg) < 0, __func__, "printf");
     exit(EXIT_SUCCESS);
 }