Update libalx

11 files changed, 70 insertions, 65 deletions

diff --git a/src/about/about.c b/src/about/about.c
index 49a7134..2ac33db 100755
--- a/src/about/about.c
+++ b/src/about/about.c
@@ -14,9 +14,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "libalx/base/compiler/size.h"
-#include "libalx/base/errno/error.h"
-#include "libalx/base/stdio/printf/sbprintf.h"
+#define ALX_NO_PREFIX
+#include <libalx/base/compiler/size.h>
+#include <libalx/base/errno/error.h>
+#include <libalx/base/stdio/printf/sbprintf.h>
 
 
 /******************************************************************************
@@ -76,14 +77,14 @@ void	print_share_file	(int file)
 		break;
 	}
 
-	if (alx_sbprintf(cmd, NULL, "less %s", fname))
+	if (sbprintf(cmd, NULL, "less %s", fname))
 		goto err;
 	if (system(cmd))
 		goto err;
 
 	return;
 err:
-	alx_perror(fname);
+	perrorx(fname);
 }
 
 void	print_version		(void)
diff --git a/src/ctrl/start.c b/src/ctrl/start.c
index 6a3ae22..563582c 100755
--- a/src/ctrl/start.c
+++ b/src/ctrl/start.c
@@ -13,7 +13,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "libalx/base/errno/error.h"
+#define ALX_NO_PREFIX
+#include <libalx/base/errno/error.h>
 
 #include "mine-sweeper/game/core.h"
 #include "mine-sweeper/game/iface.h"
@@ -101,7 +102,7 @@ static	void	start_load	(void)
 	player_iface_cleanup();
 	return;
 err:
-	alx_perror("game_init_load");
+	perrorx("game_init_load");
 }
 
 
diff --git a/src/game/core.c b/src/game/core.c
index 34e80c3..0260944 100755
--- a/src/game/core.c
+++ b/src/game/core.c
@@ -12,7 +12,8 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include "libalx/base/stdlib/seed.h"
+#define ALX_NO_PREFIX
+#include <libalx/base/stdlib/seed.h>
 
 #include "mine-sweeper/save/save.h"
 
@@ -54,7 +55,7 @@ static	void	game_flag_recursive	(ptrdiff_t r, ptrdiff_t c);
 void	game_init	(void)
 {
 
-	alx_rsrand();
+	prsrand();
 }
 
 void	game_init_rand	(ptrdiff_t rows, ptrdiff_t cols, int mines,
diff --git a/src/main.c b/src/main.c
index db194a5..d2b662f 100755
--- a/src/main.c
+++ b/src/main.c
@@ -8,7 +8,7 @@
  ******************************************************************************/
 #include <stdio.h>
 
-#include "libalx/extra/ncurses/common.h"
+#include <libalx/extra/ncurses/common.h>
 
 #include "mine-sweeper/about/about.h"
 #include "mine-sweeper/ctrl/start.h"
diff --git a/src/menu/clui.c b/src/menu/clui.c
index c62280f..58c1146 100755
--- a/src/menu/clui.c
+++ b/src/menu/clui.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#define ALX_NO_PREFIX
 #include <libalx/base/compiler/size.h>
 #include <libalx/base/errno/error.h>
 #include <libalx/base/stdio/get.h>
@@ -108,10 +109,10 @@ void	menu_clui	(void)
 
 
 err_fgets:
-	alx_perror("fgets() error\n");
+	perrorx("fgets() error\n");
 	exit(EXIT_FAILURE);
 err_sscanf:
-	alx_perror(buff);
+	perrorx(buff);
 	exit(EXIT_FAILURE);
 }
 
@@ -170,10 +171,10 @@ static	void	menu_clui_rand		(void)
 
 
 err_fgets:
-	alx_perror("fgets() error\n");
+	perrorx("fgets() error\n");
 	exit(EXIT_FAILURE);
 err_sscanf:
-	alx_perror(buff);
+	perrorx(buff);
 	exit(EXIT_FAILURE);
 }
 
@@ -231,10 +232,10 @@ static	void	menu_clui_start		(void)
 
 
 err_fgets:
-	alx_perror("fgets() error\n");
+	perrorx("fgets() error\n");
 	exit(EXIT_FAILURE);
 err_sscanf:
-	alx_perror(buff);
+	perrorx(buff);
 	exit(EXIT_FAILURE);
 }
 
diff --git a/src/menu/parser.c b/src/menu/parser.c
index c57e060..c2e38af 100755
--- a/src/menu/parser.c
+++ b/src/menu/parser.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#define ALX_NO_PREFIX
 #include <libalx/base/stdio/printf/sbprintf.h>
 #include <libalx/base/stdlib/seed.h>
 #include <libalx/base/stdlib/strto/strtof_s.h>
@@ -134,7 +135,7 @@ void	parser	(int argc, char *argv[])
 static	void	parse_rows		(const char *argument)
 {
 
-	if (alx_strtoi64_s(&menu_iface_variables.rows, argument, 0, NULL))
+	if (strtoi64_s(&menu_iface_variables.rows, argument, 0, NULL))
 		goto err;
 	if ((menu_iface_variables.rows < 2)  ||
 			(menu_iface_variables.rows > ROWS_MAX))
@@ -149,7 +150,7 @@ err:
 static	void	parse_columns		(const char *argument)
 {
 
-	if (alx_strtoi64_s(&menu_iface_variables.cols, argument, 0, NULL))
+	if (strtoi64_s(&menu_iface_variables.cols, argument, 0, NULL))
 		goto err;
 	if ((menu_iface_variables.cols < 2)  ||
 			(menu_iface_variables.cols > COLS_MAX))
@@ -172,7 +173,7 @@ static	void	parse_file		(const char *argument)
 	fclose(fp);
 
 	saved_path[0]	= '\0';
-	if (alx_sbprintf(saved_name, NULL, "%s", argument))
+	if (sbprintf(saved_name, NULL, "%s", argument))
 		goto err;
 
 	return;
@@ -186,7 +187,7 @@ err:
 static	void	parse_iface		(const char *argument)
 {
 
-	if (alx_strtoi32_s(&menu_iface_mode, argument, 0, NULL))
+	if (strtoi32_s(&menu_iface_mode, argument, 0, NULL))
 		goto err;
 	player_iface_mode	= menu_iface_mode;
 	if ((menu_iface_mode < MENU_IFACE_CLUI)  ||
@@ -203,7 +204,7 @@ err:
 static	void	parse_proportion	(const char *argument)
 {
 
-	if (alx_strtod_s(&menu_iface_variables.p, argument, NULL))
+	if (strtod_s(&menu_iface_variables.p, argument, NULL))
 		goto err;
 	if ((menu_iface_variables.p < 0)  ||  (menu_iface_variables.p > 1))
 		goto err;
@@ -225,7 +226,7 @@ static	void	parse_rand_seed		(const char *argument)
 static	void	parse_start		(const char *argument)
 {
 
-	if (alx_strtoi32_s(&start_mode, argument, 0, NULL))
+	if (strtoi32_s(&start_mode, argument, 0, NULL))
 		goto err;
 	if ((start_mode < START_FOO)  ||  (start_mode > START_LOAD))
 		goto err;
diff --git a/src/menu/tui.c b/src/menu/tui.c
index 7eabe5a..703234c 100755
--- a/src/menu/tui.c
+++ b/src/menu/tui.c
@@ -15,11 +15,11 @@
 
 #include <ncurses.h>
 
-#include "libalx/base/compiler/size.h"
-#include "libalx/base/stdio/seekc.h"
-#include "libalx/extra/ncurses/common.h"
-#include "libalx/extra/ncurses/get.h"
-#include "libalx/extra/ncurses/menu.h"
+#include <libalx/base/compiler/size.h>
+#include <libalx/base/stdio/seekc.h>
+#include <libalx/extra/ncurses/common.h>
+#include <libalx/extra/ncurses/get.h>
+#include <libalx/extra/ncurses/menu.h>
 
 #include "mine-sweeper/about/about.h"
 #include "mine-sweeper/game/iface.h"
diff --git a/src/player/iface.c b/src/player/iface.c
index 19056f2..b8bf4da 100755
--- a/src/player/iface.c
+++ b/src/player/iface.c
@@ -11,6 +11,7 @@
 #include <stddef.h>
 #include <stdio.h>
 
+#define ALX_NO_PREFIX
 #include <libalx/base/compiler/unused.h>
 #include <libalx/base/stdio/printf/sbprintf.h>
 
@@ -78,8 +79,8 @@ int	player_iface_start	(ptrdiff_t *row, ptrdiff_t *col)
 	char	subtitle[TITLE_SIZE];
 	int	fail;
 
-	UNUSED(alx_sbprintf(title, NULL, "Start:"));
-	UNUSED(alx_sbprintf(subtitle, NULL, "00:00 | 0"));
+	UNUSED(sbprintf(title, NULL, "Start:"));
+	UNUSED(sbprintf(subtitle, NULL, "00:00 | 0"));
 
 	/* Start position */
 	player_iface_position.row	= 0;
@@ -138,16 +139,16 @@ void	player_iface		(const	struct Game_Iface_Out	*out,
 	case GAME_IFACE_STATE_CHEATED:
 	case GAME_IFACE_STATE_PLAYING:
 	case GAME_IFACE_STATE_PAUSE:
-		UNUSED(alx_sbprintf(title, NULL, "Mines: %i/%i",
+		UNUSED(sbprintf(title, NULL, "Mines: %i/%i",
 						out->flags, out->mines));
 		break;
 
 	case GAME_IFACE_STATE_GAMEOVER:
-		UNUSED(alx_sbprintf(title, NULL, "GAME OVER"));
+		UNUSED(sbprintf(title, NULL, "GAME OVER"));
 		break;
 
 	case GAME_IFACE_STATE_SAFE:
-		UNUSED(alx_sbprintf(title, NULL, "You win!"));
+		UNUSED(sbprintf(title, NULL, "You win!"));
 		break;
 	}
 	/* Subtitle */
@@ -157,14 +158,14 @@ void	player_iface		(const	struct Game_Iface_Out	*out,
 		secs	= ((int)score->time % 60);
 
 		if (score->time >= 3600) {
-			UNUSED(alx_sbprintf(subtitle,NULL,"%02i:%02i:%02i | %i",
+			UNUSED(sbprintf(subtitle, NULL, "%02i:%02i:%02i | %i",
 					hours, mins, secs, score->clicks));
 		} else {
-			UNUSED(alx_sbprintf(subtitle, NULL, "%02i:%02i | %i",
+			UNUSED(sbprintf(subtitle, NULL, "%02i:%02i | %i",
 					mins, secs, score->clicks));
 		}
 	} else {
-		UNUSED(alx_sbprintf(subtitle, NULL, "N/A"));
+		UNUSED(sbprintf(subtitle, NULL, "N/A"));
 	}
 
 	/* Request player action */
diff --git a/src/player/tui.c b/src/player/tui.c
index d62d06a..73c3970 100755
--- a/src/player/tui.c
+++ b/src/player/tui.c
@@ -14,8 +14,8 @@
 
 #include <ncurses.h>
 
-#include "libalx/extra/ncurses/common.h"
-#include "libalx/extra/ncurses/get.h"
+#include <libalx/extra/ncurses/common.h>
+#include <libalx/extra/ncurses/get.h>
 
 #include "mine-sweeper/game/iface.h"
 #include "mine-sweeper/player/iface.h"
diff --git a/src/save/save.c b/src/save/save.c
index cfe48f3..5fed662 100755
--- a/src/save/save.c
+++ b/src/save/save.c
@@ -15,6 +15,7 @@
 
 #include <sys/stat.h>
 
+#define ALX_NO_PREFIX
 #include <libalx/base/compiler/unused.h>
 #include <libalx/base/errno/error.h>
 #include <libalx/base/stdio/printf/sbprintf.h>
@@ -39,11 +40,11 @@
 void	save_init	(void)
 {
 
-	if (alx_sbprintf(home_path, NULL, "%s/", getenv(ENV_HOME)))
+	if (sbprintf(home_path, NULL, "%s/", getenv(ENV_HOME)))
 		goto err_path;
-	if (alx_sbprintf(user_game_path,NULL,"%s/%s/",home_path, USER_GAME_DIR))
+	if (sbprintf(user_game_path, NULL, "%s/%s/", home_path, USER_GAME_DIR))
 		goto err_path;
-	if (alx_sbprintf(saved_path, NULL, "%s/%s/", home_path, USER_SAVED_DIR))
+	if (sbprintf(saved_path, NULL, "%s/%s/", home_path, USER_SAVED_DIR))
 		goto err_path;
 	saved_name[0]	= '\0';
 
@@ -59,21 +60,21 @@ void	save_init	(void)
 	return;
 
 err_path:
-	alx_perror(getenv(ENV_HOME));
+	perrorx(getenv(ENV_HOME));
 	exit(EXIT_FAILURE);
 err_mkdir:
-	alx_perror(home_path);
+	perrorx(home_path);
 }
 
 void	save_clr	(void)
 {
 
-	if (alx_sbprintf(saved_path, NULL, "%s/%s/", home_path, USER_SAVED_DIR))
+	if (sbprintf(saved_path, NULL, "%s/%s/", home_path, USER_SAVED_DIR))
 		goto err;
 	return;
 
 err:
-	alx_perror(home_path);
+	perrorx(home_path);
 	exit(EXIT_FAILURE);
 }
 
@@ -84,7 +85,7 @@ int	load_game_file	(void)
 	int	i;
 	int	j;
 
-	if (alx_sbprintf(fname, NULL, "%s/%s", saved_path, saved_name))
+	if (sbprintf(fname, NULL, "%s/%s", saved_path, saved_name))
 		goto err_path;
 
 	fp	= fopen(fname, "r");
@@ -115,7 +116,7 @@ int	load_game_file	(void)
 
 
 err_path:
-	alx_perror(saved_name);
+	perrorx(saved_name);
 	alx_wait4enter();
 	exit(EXIT_FAILURE);
 }
@@ -133,11 +134,11 @@ void	save_game_file	(char fpath[static restrict FILENAME_MAX])
 
 	/* Don't change saved_name variable if not in default dir */
 	if (fpath)
-		UNUSED(alx_sbprintf(old_saved, NULL, "%s", saved_name));
+		UNUSED(sbprintf(old_saved, NULL, "%s", saved_name));
 
 	/* Default path & name */
 	save_clr();
-	UNUSED(alx_sbprintf(saved_name, NULL, "%s", SAVED_NAME_DEFAULT));
+	UNUSED(sbprintf(saved_name, NULL, "%s", SAVED_NAME_DEFAULT));
 	file_num[0]	= '\0';
 
 	/* Request file name */
@@ -147,15 +148,13 @@ void	save_game_file	(char fpath[static restrict FILENAME_MAX])
 	x	= true;
 	for (i = 0; x; i++) {
 		if (!fpath) {
-			if (alx_sbprintf(fname, NULL, "%s/%s%s%s",
-					saved_path, saved_name, file_num,
-					FILE_EXTENSION)) {
+			if (sbprintf(fname, NULL, "%s/%s%s%s", saved_path,
+					saved_name, file_num, FILE_EXTENSION)) {
 				goto err_path;
 			}
 		} else {
-			if (alx_sbprintf(fname, NULL, "%s/%s%s%s",
-					fpath, saved_name, file_num,
-					FILE_EXTENSION)) {
+			if (sbprintf(fname, NULL, "%s/%s%s%s", fpath,
+					saved_name, file_num, FILE_EXTENSION)) {
 				goto err_path;
 			}
 		}
@@ -170,18 +169,18 @@ void	save_game_file	(char fpath[static restrict FILENAME_MAX])
 			file_num[4] =	'\0';
 		} else {
 			x	= false;
-			if (alx_sbprintf(tmp, NULL, "%s%s%s",
+			if (sbprintf(tmp, NULL, "%s%s%s",
 					saved_name, file_num, FILE_EXTENSION)) {
 				goto err_path;
 			}
-			UNUSED(alx_sbprintf(saved_name, NULL, "%s", tmp));
+			UNUSED(sbprintf(saved_name, NULL, "%s", tmp));
 		}
 	}
 
 	/* Write to a new file */
 	fp	= fopen(fname, "w");
 	if (!fp) {
-		alx_perror(fname);
+		perrorx(fname);
 		goto err_fopen;
 	}
 	fprintf(fp, "mine-sweeper saved game\n");
@@ -209,13 +208,13 @@ void	save_game_file	(char fpath[static restrict FILENAME_MAX])
 err_fopen:
 	/* Don't change saved_name if saving in non-default dir */
 	if (fpath)
-		UNUSED(alx_sbprintf(saved_name, NULL, "%s", old_saved));
+		UNUSED(sbprintf(saved_name, NULL, "%s", old_saved));
 
 	return;
 
 
 err_path:
-	alx_perror(fname);
+	perrorx(fname);
 	alx_wait4enter();
 	exit(EXIT_FAILURE);
 }
diff --git a/src/save/score.c b/src/save/score.c
index 79121d9..e6de6ec 100755
--- a/src/save/score.c
+++ b/src/save/score.c
@@ -14,6 +14,7 @@
 #include <stdlib.h>
 #include <time.h>
 
+#define ALX_NO_PREFIX
 #include <libalx/base/errno/error.h>
 #include <libalx/base/compiler/size.h>
 #include <libalx/base/stdio/printf/sbprintf.h>
@@ -98,24 +99,23 @@ void	save_score	(const struct Game_Iface_Score  *game_iface_score)
 	return;
 
 err_fp:
-	alx_perror(fname);
+	perrorx(fname);
 }
 
 void	print_scores	(void)
 {
 	char	cmd[_POSIX_ARG_MAX];
 
-	if (alx_sbprintf(cmd, NULL, "less %s %s %s",
-					HISCORES_BEGINNER_FILE,
-					HISCORES_INTERMEDIATE_FILE,
-					HISCORES_EXPERT_FILE)) {
+	if (sbprintf(cmd, NULL, "less %s %s %s", HISCORES_BEGINNER_FILE,
+						 HISCORES_INTERMEDIATE_FILE,
+						 HISCORES_EXPERT_FILE)) {
 		goto err;
 	}
 	if (system(cmd))
 		goto err;
 	return;
 err:
-	alx_perror(cmd);
+	perrorx(cmd);
 }