c/libxlsxwriter
1
0
Fork 0
mirror of https://github.com/jmcnamara/libxlsxwriter synced 2025-03-28 21:13:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor code refactoring.

Browse Source
This commit is contained in:
John McNamara 2015-12-05 02:15:15 +00:00
parent c92cd770b7
commit e0a46f2667
3 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.indent.pro vendored
View File

@ -37,6 +37,7 @@
-T time_t
-T LIST_ENTRY
-T RB_ENTRY
-T SLIST_ENTRY
-T STAILQ_ENTRY
-T TAILQ_ENTRY

6
include/xlsxwriter/third_party/tree.h vendored
View File

@ -30,9 +30,9 @@
#ifndef _SYS_TREE_H_
#define _SYS_TREE_H_
#include <sys/cdefs.h>
/* #include <sys/cdefs.h> */
/* Define a portable way of marking parameters unused */
/* Added by libxlsxwriter to define a portable unused attribute. */
#if defined(__GNUC__)
#define UNUSED __attribute__((unused))
#elif defined(__clang__)
@ -97,7 +97,7 @@ struct { \
SPLAY_RIGHT(tmp, field) = (head)->sph_root; \
(head)->sph_root = tmp; \
} while (/*CONSTCOND*/ 0)
#define SPLAY_ROTATE_LEFT(head, tmp, field) do { \
SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(tmp, field); \
SPLAY_LEFT(tmp, field) = (head)->sph_root; \

51
src/worksheet.c
View File

@ -25,22 +25,17 @@
* Forward declarations.
*/
STATIC void _worksheet_write_rows(lxw_worksheet *self);
STATIC int _row_cmp(lxw_row *row1, lxw_row *row2);
STATIC int lxw_row_cmp(lxw_row *r1, lxw_row *r2)
{
if (r1->row_num < r2->row_num) return -1;
if (r1->row_num > r2->row_num) return 1;
return 0;
}
RB_GENERATE_STATIC(lxw_table_rows, lxw_row, tree_pointers, lxw_row_cmp)
/* *INDENT-OFF* */
RB_GENERATE_STATIC(lxw_table_rows, lxw_row, tree_pointers, _row_cmp)
/* *INDENT-ON* */
/*****************************************************************************
*
* Private functions.
*
****************************************************************************/
/*
* Create a new worksheet object.
*/
@ -178,6 +173,7 @@ _free_row(lxw_row *row)
TAILQ_REMOVE(row->cells, cell, list_pointers);
_free_cell(cell);
}
free(row->cells);
free(row);
}
@ -188,7 +184,8 @@ _free_row(lxw_row *row)
void
_free_worksheet(lxw_worksheet *worksheet)
{
lxw_row *row, *next_row;
lxw_row *row;
lxw_row *next_row;
lxw_col_t col;
lxw_merged_range *merged_range;
lxw_selection *selection;
@ -209,9 +206,8 @@ _free_worksheet(lxw_worksheet *worksheet)
free(worksheet->col_formats);
if (worksheet->table) {
for (row=RB_MIN(lxw_table_rows, worksheet->table); row;
row = next_row) {
for (row = RB_MIN(lxw_table_rows, worksheet->table); row;
row = next_row) {
next_row = RB_NEXT(lxw_table_rows, worksheet->table, row);
RB_REMOVE(lxw_table_rows, worksheet->table, row);
_free_row(row);
@ -222,8 +218,8 @@ _free_worksheet(lxw_worksheet *worksheet)
if (worksheet->hyperlinks) {
for (row=RB_MIN(lxw_table_rows, worksheet->hyperlinks); row;
row = next_row) {
for (row = RB_MIN(lxw_table_rows, worksheet->hyperlinks); row;
row = next_row) {
next_row = RB_NEXT(lxw_table_rows, worksheet->hyperlinks, row);
RB_REMOVE(lxw_table_rows, worksheet->hyperlinks, row);
@ -446,14 +442,15 @@ _new_hyperlink_cell(lxw_row_t row_num, lxw_col_t col_num,
STATIC lxw_row *
_get_row_list(struct lxw_table_rows *table, lxw_row_t row_num)
{
lxw_row *row, *existing_row;
lxw_row *row;
lxw_row *existing_row;
/* Create a new row and try and insert it */
/* Create a new row and try and insert it. */
row = _new_row(row_num);
existing_row = RB_INSERT(lxw_table_rows, table, row);
/* If existing_row is not NULL, then it already existed. Free new row */
/* and return existing_row */
/* and return existing_row. */
if (existing_row) {
_free_row(row);
row = existing_row;
@ -654,6 +651,19 @@ _check_dimensions(lxw_worksheet *self,
return 0;
}
/*
* Comparator for the row structure red/black tree.
*/
STATIC int
_row_cmp(lxw_row *row1, lxw_row *row2)
{
if (row1->row_num > row2->row_num)
return 1;
if (row1->row_num < row2->row_num)
return -1;
return 0;
}
/*****************************************************************************
*
* XML functions.
@ -1457,8 +1467,7 @@ _write_inline_string_cell(lxw_worksheet *self, lxw_cell *cell)
* The span is the same for each block of 16 rows.
*/
STATIC void
_calculate_spans(struct lxw_row *row, UNUSED struct lxw_table_rows *root,
char *span, int32_t *block_num)
_calculate_spans(struct lxw_row *row, char *span, int32_t *block_num)
{
lxw_col_t span_col_min = TAILQ_FIRST(row->cells)->col_num;
lxw_col_t span_col_max = TAILQ_LAST(row->cells, lxw_table_cells)->col_num;
@ -1573,7 +1582,7 @@ _worksheet_write_rows(lxw_worksheet *self)
else {
/* Row and cell data. */
if ((int32_t) row->row_num / 16 > block_num)
_calculate_spans(row, self->table, spans, &block_num);
_calculate_spans(row, spans, &block_num);
_write_row(self, row, spans);