3rd-party/libfort
1
0
Fork 0
Code Releases Activity

[D] Removed redundant code

Browse Source
This commit is contained in:
seleznevae 2018-09-01 16:19:35 +03:00
parent f28ae825b2
commit 985a84e57d
4 changed files with 18 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/fort.c
View File

@ -346,16 +346,6 @@ int buffer_wprintf(string_buffer_t *buffer, size_t buffer_row, wchar_t *buf, siz
#include <stdint.h> #include <stdint.h>
#include <limits.h> #include <limits.h>
struct fort_column_options {
int col_min_width;
enum ft_text_alignment align;
};
extern fort_column_options_t g_column_options;
FT_INTERNAL
fort_column_options_t create_column_options(void);
#define OPTION_IS_SET(ft_opts, option) ((ft_opts) & (option)) #define OPTION_IS_SET(ft_opts, option) ((ft_opts) & (option))
#define OPTION_SET(ft_opts, option) ((ft_opts) |=(option)) #define OPTION_SET(ft_opts, option) ((ft_opts) |=(option))
#define OPTION_UNSET(ft_opts, option) ((ft_opts) &= ~((uint32_t)option)) #define OPTION_UNSET(ft_opts, option) ((ft_opts) &= ~((uint32_t)option))
@ -498,8 +488,10 @@ size_t max_border_elem_strlen(struct fort_table_options *);
FT_INTERNAL FT_INTERNAL
fort_table_options_t *create_table_options(void); fort_table_options_t *create_table_options(void);
/*
FT_INTERNAL FT_INTERNAL
fort_table_options_t *copy_table_options(const fort_table_options_t *option); fort_table_options_t *copy_table_options(const fort_table_options_t *option);
*/
FT_INTERNAL FT_INTERNAL
void destroy_table_options(fort_table_options_t *options); void destroy_table_options(fort_table_options_t *options);
@ -768,22 +760,6 @@ static int get_option_value_if_exists_otherwise_default(const struct fort_cell_o
} }
fort_column_options_t g_column_options = {
0, /* col_min_width*/
FT_ALIGNED_RIGHT, /* align */
};
FT_INTERNAL
fort_column_options_t create_column_options(void)
{
fort_column_options_t result;
memset(&result, '\0', sizeof(result));
memcpy(&result, &g_column_options, sizeof(result));
return result;
}
//#define DEFAULT_CELL_OPTION {FT_ROW_UNSPEC, FT_COLUMN_UNSPEC, 0, 0, 0} //#define DEFAULT_CELL_OPTION {FT_ROW_UNSPEC, FT_COLUMN_UNSPEC, 0, 0, 0}
FT_INTERNAL FT_INTERNAL
fort_cell_opt_container_t *create_cell_opt_container(void) fort_cell_opt_container_t *create_cell_opt_container(void)
@ -1327,11 +1303,11 @@ fort_table_options_t *create_table_options(void)
return options; return options;
} }
/*
FT_INTERNAL FT_INTERNAL
fort_table_options_t *copy_table_options(const fort_table_options_t *option) fort_table_options_t *copy_table_options(const fort_table_options_t *option)
{ {
/* todo: normal implementation, do deep copy of col options */ // todo: normal implementation, do deep copy of col options
fort_table_options_t *new_opt = create_table_options(); fort_table_options_t *new_opt = create_table_options();
if (new_opt == NULL) if (new_opt == NULL)
@ -1349,6 +1325,7 @@ fort_table_options_t *copy_table_options(const fort_table_options_t *option)
} }
return new_opt; return new_opt;
} }
*/
FT_INTERNAL FT_INTERNAL
@ -3158,6 +3135,7 @@ size_t buffer_text_width(string_buffer_t *buffer)
++n; ++n;
} }
} else { } else {
#ifdef FT_HAVE_WCHAR
while (1) { while (1) {
const wchar_t *beg = NULL; const wchar_t *beg = NULL;
const wchar_t *end = NULL; const wchar_t *end = NULL;
@ -3172,7 +3150,10 @@ size_t buffer_text_width(string_buffer_t *buffer)
++n; ++n;
} }
#endif /* FT_HAVE_WCHAR */
} }
return max_length; /* shouldn't be here */
} }

21
src/options.c
View File

@ -57,22 +57,6 @@ static int get_option_value_if_exists_otherwise_default(const struct fort_cell_o
} }
fort_column_options_t g_column_options = {
0, /* col_min_width*/
FT_ALIGNED_RIGHT, /* align */
};
FT_INTERNAL
fort_column_options_t create_column_options(void)
{
fort_column_options_t result;
memset(&result, '\0', sizeof(result));
memcpy(&result, &g_column_options, sizeof(result));
return result;
}
//#define DEFAULT_CELL_OPTION {FT_ROW_UNSPEC, FT_COLUMN_UNSPEC, 0, 0, 0} //#define DEFAULT_CELL_OPTION {FT_ROW_UNSPEC, FT_COLUMN_UNSPEC, 0, 0, 0}
FT_INTERNAL FT_INTERNAL
fort_cell_opt_container_t *create_cell_opt_container(void) fort_cell_opt_container_t *create_cell_opt_container(void)
@ -616,11 +600,11 @@ fort_table_options_t *create_table_options(void)
return options; return options;
} }
/*
FT_INTERNAL FT_INTERNAL
fort_table_options_t *copy_table_options(const fort_table_options_t *option) fort_table_options_t *copy_table_options(const fort_table_options_t *option)
{ {
/* todo: normal implementation, do deep copy of col options */ // todo: normal implementation, do deep copy of col options
fort_table_options_t *new_opt = create_table_options(); fort_table_options_t *new_opt = create_table_options();
if (new_opt == NULL) if (new_opt == NULL)
@ -638,6 +622,7 @@ fort_table_options_t *copy_table_options(const fort_table_options_t *option)
} }
return new_opt; return new_opt;
} }
*/
FT_INTERNAL FT_INTERNAL

12
src/options.h
View File

@ -5,16 +5,6 @@
#include <stdint.h> #include <stdint.h>
#include <limits.h> #include <limits.h>
struct fort_column_options {
int col_min_width;
enum ft_text_alignment align;
};
extern fort_column_options_t g_column_options;
FT_INTERNAL
fort_column_options_t create_column_options(void);
#define OPTION_IS_SET(ft_opts, option) ((ft_opts) & (option)) #define OPTION_IS_SET(ft_opts, option) ((ft_opts) & (option))
#define OPTION_SET(ft_opts, option) ((ft_opts) |=(option)) #define OPTION_SET(ft_opts, option) ((ft_opts) |=(option))
#define OPTION_UNSET(ft_opts, option) ((ft_opts) &= ~((uint32_t)option)) #define OPTION_UNSET(ft_opts, option) ((ft_opts) &= ~((uint32_t)option))
@ -157,8 +147,10 @@ size_t max_border_elem_strlen(struct fort_table_options *);
FT_INTERNAL FT_INTERNAL
fort_table_options_t *create_table_options(void); fort_table_options_t *create_table_options(void);
/*
FT_INTERNAL FT_INTERNAL
fort_table_options_t *copy_table_options(const fort_table_options_t *option); fort_table_options_t *copy_table_options(const fort_table_options_t *option);
*/
FT_INTERNAL FT_INTERNAL
void destroy_table_options(fort_table_options_t *options); void destroy_table_options(fort_table_options_t *options);

4
src/string_buffer.c
View File

@ -286,6 +286,7 @@ size_t buffer_text_width(string_buffer_t *buffer)
++n; ++n;
} }
} else { } else {
#ifdef FT_HAVE_WCHAR
while (1) { while (1) {
const wchar_t *beg = NULL; const wchar_t *beg = NULL;
const wchar_t *end = NULL; const wchar_t *end = NULL;
@ -300,7 +301,10 @@ size_t buffer_text_width(string_buffer_t *buffer)
++n; ++n;
} }
#endif /* FT_HAVE_WCHAR */
} }
return max_length; /* shouldn't be here */
} }