From 0467409d6c10576687ec5681aa84ceb69b7d338f Mon Sep 17 00:00:00 2001
From: seleznevae <seleznevae@protonmail.com>
Date: Mon, 7 May 2018 22:44:17 +0300
Subject: [PATCH] [F] Fixed warnings

---
 example/main.c  |  2 +-
 lib/fort.c      | 11 +++++++----
 src/fort_impl.c |  4 ++--
 src/row.c       |  7 +++++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/example/main.c b/example/main.c
index 17c9b9a..8398731 100644
--- a/example/main.c
+++ b/example/main.c
@@ -61,7 +61,7 @@ int main(void)
     ft_set_cell_option(table, FT_ANY_ROW, 1, FT_COPT_TEXT_ALIGN, FT_ALIGNED_LEFT);
 
     ft_set_cell_option(table, 0, FT_ANY_COLUMN, FT_COPT_ROW_TYPE, FT_ROW_HEADER);
-    ft_printf_ln(table, "Rank|Title|Year|Rating");
+    ft_write_ln(table, "Rank", "Title", "Year", "Rating");
 
     ft_write_ln(table, "1", "The Shawshank Redemption", "1994", "9.5");
     ft_write_ln(table, "2", "12 Angry Men", "1957", "8.8");
diff --git a/lib/fort.c b/lib/fort.c
index a658f57..daa1b2f 100644
--- a/lib/fort.c
+++ b/lib/fort.c
@@ -1699,7 +1699,7 @@ static int ft_row_printf_impl(ft_table_t *table, size_t row, const char *fmt, va
 
     table->cur_col += new_cols;
     destroy_row(new_row);
-    return new_cols;
+    return (int)new_cols;
 
 clear:
     destroy_row(new_row);
@@ -1746,7 +1746,7 @@ static int ft_row_wprintf_impl(ft_table_t *table, size_t row, const wchar_t *fmt
 
     table->cur_col += new_cols;
     destroy_row(new_row);
-    return new_cols;
+    return (int)new_cols;
 
 clear:
     destroy_row(new_row);
@@ -3633,10 +3633,13 @@ fort_status_t swap_row(fort_row_t *cur_row, fort_row_t *ins_row, size_t pos)
 size_t group_cell_number(const fort_row_t *row, size_t master_cell_col)
 {
     assert(row);
-    const fort_cell_t *cell = get_cell_c(row, master_cell_col);
-    if (cell == NULL)
+    const fort_cell_t *master_cell = get_cell_c(row, master_cell_col);
+    if (master_cell == NULL)
         return 0;
 
+    if (get_cell_type(master_cell) != GroupMasterCell)
+        return 1;
+
     size_t total_cols = vector_size(row->cells);
     size_t slave_col = master_cell_col + 1;
     while (slave_col < total_cols) {
diff --git a/src/fort_impl.c b/src/fort_impl.c
index 1a9041d..0360cc8 100644
--- a/src/fort_impl.c
+++ b/src/fort_impl.c
@@ -163,7 +163,7 @@ static int ft_row_printf_impl(ft_table_t *table, size_t row, const char *fmt, va
 
     table->cur_col += new_cols;
     destroy_row(new_row);
-    return new_cols;
+    return (int)new_cols;
 
 clear:
     destroy_row(new_row);
@@ -210,7 +210,7 @@ static int ft_row_wprintf_impl(ft_table_t *table, size_t row, const wchar_t *fmt
 
     table->cur_col += new_cols;
     destroy_row(new_row);
-    return new_cols;
+    return (int)new_cols;
 
 clear:
     destroy_row(new_row);
diff --git a/src/row.c b/src/row.c
index ba3393e..cd4b6e2 100644
--- a/src/row.c
+++ b/src/row.c
@@ -125,10 +125,13 @@ fort_status_t swap_row(fort_row_t *cur_row, fort_row_t *ins_row, size_t pos)
 size_t group_cell_number(const fort_row_t *row, size_t master_cell_col)
 {
     assert(row);
-    const fort_cell_t *cell = get_cell_c(row, master_cell_col);
-    if (cell == NULL)
+    const fort_cell_t *master_cell = get_cell_c(row, master_cell_col);
+    if (master_cell == NULL)
         return 0;
 
+    if (get_cell_type(master_cell) != GroupMasterCell)
+        return 1;
+
     size_t total_cols = vector_size(row->cells);
     size_t slave_col = master_cell_col + 1;
     while (slave_col < total_cols) {