Unify about.c functions

7 files changed, 46 insertions, 76 deletions

diff --git a/modules/about/inc/about.h b/modules/about/inc/about.h
index b51eee9..4c611ae 100644
--- a/modules/about/inc/about.h
+++ b/modules/about/inc/about.h
@@ -25,6 +25,20 @@
 

 

 /******************************************************************************

+ ******* enums ****************************************************************

+ ******************************************************************************/

+	enum	Share_File {

+		SHARE_COPYRIGHT,

+		SHARE_DISCLAIMER,

+		SHARE_HELP,

+		SHARE_LICENSE,

+		SHARE_USAGE

+	};

+	# define	PROG_NAME	"mine-sweeper"

+	# define	PROG_YEAR	"2015"

+

+

+/******************************************************************************

  ******* variables ************************************************************

  ******************************************************************************/

 	extern	char	share_path [FILENAME_MAX];

@@ -33,13 +47,9 @@
 /******************************************************************************

  ******* functions ************************************************************

  ******************************************************************************/

-	void	about_init	(void);

-	void	print_cpright	(void);

-	void	print_disclaim	(void);

-	void	print_help	(void);

-	void	print_license	(void);

-	void	print_usage	(void);

-	void	print_version	(void);

+	void	about_init		(void);

+	void	print_share_file	(int share_file);

+	void	print_version		(void);

 

 

 /******************************************************************************

diff --git a/modules/about/src/about.c b/modules/about/src/about.c
index 3a2befe..a18cbf0 100644
--- a/modules/about/src/about.c
+++ b/modules/about/src/about.c
@@ -49,68 +49,28 @@ void	about_init		(void)
 	snprintf(share_path, FILENAME_MAX, "%s/%s/", INSTALL_SHARE_DIR, SHARE_DIR);

 }

 

-void	print_cpright		(void)

+void	print_share_file	(int share_file)

 {

 	char	file_name [FILENAME_MAX];

 	char	str [BUFF_SIZE_TEXT];

 

-	snprintf(file_name, FILENAME_MAX, "%s/%s", share_path, "COPYRIGHT.txt");

-

-	alx_snprint_file(str, BUFF_SIZE_TEXT, file_name);

-

-	printf(BEGINNING);

-	printf("%s", str);

-	printf(ENDING);

-}

-

-void	print_disclaim		(void)

-{

-	char	file_name [FILENAME_MAX];

-	char	str [BUFF_SIZE_TEXT];

-

-	snprintf(file_name, FILENAME_MAX, "%s/%s", share_path, "DISCLAIMER.txt");

-

-	alx_snprint_file(str, BUFF_SIZE_TEXT, file_name);

-

-	printf(BEGINNING);

-	printf("%s", str);

-	printf(ENDING);

-}

-

-void	print_help		(void)

-{

-	char	file_name [FILENAME_MAX];

-	char	str [BUFF_SIZE_TEXT];

-

-	snprintf(file_name, FILENAME_MAX, "%s/%s", share_path, "HELP.txt");

-

-	alx_snprint_file(str, BUFF_SIZE_TEXT, file_name);

-

-	printf(BEGINNING);

-	printf("%s", str);

-	printf(ENDING);

-}

-

-void	print_license		(void)

-{

-	char	file_name [FILENAME_MAX];

-	char	str [BUFF_SIZE_TEXT];

-

-	snprintf(file_name, FILENAME_MAX, "%s/%s", share_path, "LICENSE.txt");

-

-	alx_snprint_file(str, BUFF_SIZE_TEXT, file_name);

-

-	printf(BEGINNING);

-	printf("%s", str);

-	printf(ENDING);

-}

-

-void	print_usage		(void)

-{

-	char	file_name [FILENAME_MAX];

-	char	str [BUFF_SIZE_TEXT];

-

-	snprintf(file_name, FILENAME_MAX, "%s/%s", share_path, "USAGE.txt");

+	switch (share_file) {

+	case SHARE_COPYRIGHT:

+		snprintf(file_name, FILENAME_MAX, "%s/%s", share_path, "COPYRIGHT.txt");

+		break;

+	case SHARE_DISCLAIMER:

+		snprintf(file_name, FILENAME_MAX, "%s/%s", share_path, "DISCLAIMER.txt");

+		break;

+	case SHARE_HELP:

+		snprintf(file_name, FILENAME_MAX, "%s/%s", share_path, "HELP.txt");

+		break;

+	case SHARE_LICENSE:

+		snprintf(file_name, FILENAME_MAX, "%s/%s", share_path, "LICENSE.txt");

+		break;

+	case SHARE_USAGE:

+		snprintf(file_name, FILENAME_MAX, "%s/%s", share_path, "USAGE.txt");

+		break;

+	}

 

 	alx_snprint_file(str, BUFF_SIZE_TEXT, file_name);

 

diff --git a/modules/menu/src/menu_clui.c b/modules/menu/src/menu_clui.c
index 03c92d9..6fccbe0 100644
--- a/modules/menu/src/menu_clui.c
+++ b/modules/menu/src/menu_clui.c
@@ -68,7 +68,7 @@ void	menu_clui	(void)
 	sscanf(buff, " %c", &ch);

 	if (ch == 'y' || ch == 'Y') {

 		puts (" >yes");

-		print_disclaim();

+		print_share_file(SHARE_DISCLAIMER);

 	} else {

 		puts (" >NO");

 	}

@@ -79,7 +79,7 @@ void	menu_clui	(void)
 	sscanf(buff, " %c", &ch);

 	if (ch == 'y' || ch == 'Y') {

 		puts (" >yes");

-		print_license();

+		print_share_file(SHARE_LICENSE);

 	} else {

 		puts (" >NO");

 	}

diff --git a/modules/menu/src/menu_gui.c b/modules/menu/src/menu_gui.c
index 38387b9..c19b6f6 100644
--- a/modules/menu/src/menu_gui.c
+++ b/modules/menu/src/menu_gui.c
@@ -192,10 +192,10 @@ void	menu_gui		(void)
 			menu_gui_continue();

 			break;

 		case 2:

-			print_disclaim();

+			print_share_file(SHARE_DISCLAIMER);

 			break;

 		case 3:

-			print_license();

+			print_share_file(SHARE_LICENSE);

 			break;

 		}

 	}

diff --git a/modules/menu/src/menu_tui.c b/modules/menu/src/menu_tui.c
index 43e4b92..436ef6c 100644
--- a/modules/menu/src/menu_tui.c
+++ b/modules/menu/src/menu_tui.c
@@ -98,14 +98,14 @@ void	menu_tui		(void)
 

 		case 2:

 			alx_pause_curses();

-			print_disclaim();

+			print_share_file(SHARE_DISCLAIMER);

 			getchar();

 			alx_resume_curses();

 			break;

 

 		case 3:

 			alx_pause_curses();

-			print_license();

+			print_share_file(SHARE_LICENSE);

 			getchar();

 			alx_resume_curses();

 			break;

diff --git a/modules/menu/src/parser.c b/modules/menu/src/parser.c
index 4333bb7..2a20afb 100644
--- a/modules/menu/src/parser.c
+++ b/modules/menu/src/parser.c
@@ -86,15 +86,15 @@ void	parser	(int argc, char *argv[])
 			break;

 

 		case 'h':

-			print_help();

+			print_share_file(SHARE_HELP);

 			exit(EXIT_SUCCESS);

 

 		case 'L':

-			print_license();

+			print_share_file(SHARE_LICENSE);

 			exit(EXIT_SUCCESS);

 

 		case 'u':

-			print_usage();

+			print_share_file(SHARE_USAGE);

 			exit(EXIT_SUCCESS);

 

 		case 'v':

@@ -134,7 +134,7 @@ void	parser	(int argc, char *argv[])
 			/* getopt_long already printed an error message. */

 

 		default:

-			print_usage();

+			print_share_file(SHARE_USAGE);

 			exit(EXIT_FAILURE);

 		}

 	}

diff --git a/src/main.c b/src/main.c
index edbce96..fbb8561 100644
--- a/src/main.c
+++ b/src/main.c
@@ -44,7 +44,7 @@ int	main	(int argc, char *argv[])
 	init_all(&argc, &argv);

 

 	/* Print copyright () and wait for any key to continue */

-	print_cpright();

+	print_share_file(SHARE_COPYRIGHT);

 	getchar();

 

 	/* Start () */