Skip to content

Commit ea6e9ec

Browse files
committed
refactor: remove redudancy in add_new_tab function
This add a parameter to the function with int type. Signed-of-by: Kent Tonino <[email protected]>
1 parent 15f665c commit ea6e9ec

15 files changed

+54
-56
lines changed

bin/tempscale

80 Bytes
Binary file not shown.

src/displays/app_description.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22
#include "escape_sequence.h"
33

44
void app_description(void) {
5-
add_new_tab();
5+
add_new_tab(1);
66
printf("%s--------------------------------------------------%s", BLUE, RESET);
77
add_new_line(2);
8-
add_new_tab();
9-
add_new_tab();
10-
add_new_tab();
8+
add_new_tab(3);
119
printf(" %sTempScale%s", GREEN, RESET);
1210
add_new_line(2);
13-
add_new_tab();
11+
add_new_tab(1);
1412
printf(" A CLI tool for converting temperature scale.");
1513
add_new_line(2);
16-
add_new_tab();
14+
add_new_tab(1);
1715
printf("%s--------------------------------------------------%s", BLUE, RESET);
1816
}

src/displays/app_option_error.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#include "escape_sequence.h"
33

44
void app_option_error(void) {
5-
add_new_tab();
5+
add_new_tab(1);
66
printf("%sInvalid option. Please try again.%s", RED, RESET);
77
}

src/displays/app_options.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@
33

44
void app_options(void) {
55
// * Celsius option.
6-
add_new_tab();
6+
add_new_tab(1);
77
printf(" %s[%s %s1%s %s]%s Celsius (°C)", BLUE, RESET, GREEN, RESET, BLUE,
88
RESET);
99
add_new_line(1);
1010

1111
// * Fahrenheit option.
12-
add_new_tab();
12+
add_new_tab(1);
1313
printf(" %s[%s %s2%s %s]%s Fahrenheit (°F)", BLUE, RESET, GREEN, RESET, BLUE,
1414
RESET);
1515
add_new_line(1);
1616

1717
// * Kelvin option.
18-
add_new_tab();
18+
add_new_tab(1);
1919
printf(" %s[%s %s3%s %s]%s Kelvin (°K)", BLUE, RESET, GREEN, RESET, BLUE,
2020
RESET);
2121
add_new_line(1);
2222

2323
// * Rankine option.
24-
add_new_tab();
24+
add_new_tab(1);
2525
printf(" %s[%s %s4%s %s]%s Rankine (°R)", BLUE, RESET, GREEN, RESET, BLUE,
2626
RESET);
2727
add_new_line(1);
2828

2929
// * Rankine option.
30-
add_new_tab();
30+
add_new_tab(1);
3131
printf(" %s[%s %s5%s %s]%s Exit", BLUE, RESET, GREEN, RESET, BLUE, RESET);
3232
}

src/displays/escape_sequence.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@ void add_new_line(int num_lines) {
66
}
77
}
88

9-
void add_new_tab(void) { printf("\t"); }
9+
void add_new_tab(int num_tabs) {
10+
for (int i = 0; i < num_tabs; i++) {
11+
printf("\t");
12+
}
13+
}

src/displays/escape_sequence.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define ESCAPE_SEQUENCE_H
33
#include "escape_sequence.c"
44

5-
extern void add_new_line(int num);
6-
extern void add_new_tab(void);
5+
extern void add_new_line(int num_lines);
6+
extern void add_new_tab(int num_tabs);
77

88
#endif

src/inputs/app_option.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ int app_option(void) {
66
int option = 0;
77
char *garbage_buffer = malloc(sizeof(char) * 50);
88

9-
add_new_tab();
9+
add_new_tab(1);
1010
printf(" %sEnter the option:%s ", BLUE, RESET);
1111
scanf("%d", &option);
1212
fgets(garbage_buffer, 50, stdin);

src/scales/celcius_description.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
#include "../displays/escape_sequence.h"
33

44
void celsius_description(void) {
5-
add_new_tab();
5+
add_new_tab(1);
66
printf("%s--------------------------------------------------%s", BLUE, RESET);
77
add_new_line(2);
8-
add_new_tab();
9-
add_new_tab();
8+
add_new_tab(2);
109
printf(" %sCelsius (°C) to Other Scale%s", GREEN, RESET);
1110
add_new_line(2);
12-
add_new_tab();
11+
add_new_tab(1);
1312
printf("%s--------------------------------------------------%s", BLUE, RESET);
1413
}

src/scales/celsius_option.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ void celsius_option(void) {
2121

2222
// * Display the error message.
2323
if (invalid_input) {
24-
add_new_tab();
24+
add_new_tab(1);
2525
printf(" %sInvalid input. Please try again.%s", RED, RESET);
2626
add_new_line(2);
2727
}
2828

2929
// * Ask the input.
30-
add_new_tab();
30+
add_new_tab(1);
3131
printf(" Celsius (°C) : ");
3232
scanf("%s", celsius_string);
3333
fgets(garbage_buffer, 50, stdin);
@@ -46,27 +46,27 @@ void celsius_option(void) {
4646

4747
// * Handle computation for fahrenheit.
4848
double fahrenheit = ((9.0 / 5.0) * celsius_double) + 32;
49-
add_new_tab();
49+
add_new_tab(1);
5050
printf(" %sFahrenheit (°F)%s : %s%.4lf (°F)%s ", BLUE, RESET, YELLOW,
5151
fahrenheit, RESET);
5252
add_new_line(1);
5353

5454
// * Handle computation for kelvbin
5555
double kelvin = celsius_double + 273.15;
56-
add_new_tab();
56+
add_new_tab(1);
5757
printf(" %sKelvin (°K)%s : %s%.4lf (°K)%s", BLUE, RESET, YELLOW,
5858
kelvin, RESET);
5959
add_new_line(1);
6060

6161
// * Handle computation for rankine.
6262
double rankine = celsius_double * (9.0 / 5.0) + 491.67;
63-
add_new_tab();
63+
add_new_tab(1);
6464
printf(" %sRankine (°R)%s : %s%.4lf (°R)%s", BLUE, RESET, YELLOW,
6565
rankine, RESET);
6666
add_new_line(2);
6767

6868
// * Ask user if want to try again.
69-
add_new_tab();
69+
add_new_tab(1);
7070
printf(" Try again (1-yes, 0-no): ");
7171
scanf("%d", &try_again);
7272
fgets(garbage_buffer, 50, stdin);

src/scales/fahrenheit_description.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
#include "../displays/escape_sequence.h"
33

44
void fahrenheit_description(void) {
5-
add_new_tab();
5+
add_new_tab(1);
66
printf("%s--------------------------------------------------%s", BLUE, RESET);
77
add_new_line(2);
8-
add_new_tab();
9-
add_new_tab();
8+
add_new_tab(1);
109
printf(" %sFahrenheit (°F) to Other Scale%s", GREEN, RESET);
1110
add_new_line(2);
12-
add_new_tab();
11+
add_new_tab(1);
1312
printf("%s--------------------------------------------------%s", BLUE, RESET);
1413
}

0 commit comments

Comments
 (0)