From: Christopher Faulet Date: Tue, 7 Nov 2023 06:50:22 +0000 (+0100) Subject: CLEANUP: htx: Properly indent htx_reserve_max_data() function X-Git-Tag: v2.9-dev10~148 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5fe2013a9451ef2c83f4ef0ae2ce11a5a6bf1a4;p=thirdparty%2Fhaproxy.git CLEANUP: htx: Properly indent htx_reserve_max_data() function Spaces were used instead of tabs to indent htx_reserve_max_data() function. Let's reindent the whole function. --- diff --git a/src/htx.c b/src/htx.c index de7cfc31ca..a494a8b9ff 100644 --- a/src/htx.c +++ b/src/htx.c @@ -887,59 +887,59 @@ struct htx_sl *htx_replace_stline(struct htx *htx, struct htx_blk *blk, const st */ struct htx_ret htx_reserve_max_data(struct htx *htx) { - struct htx_blk *blk, *tailblk; - uint32_t sz, room; - int32_t len = htx_free_data_space(htx); - - if (htx->head == -1) - goto rsv_new_block; - - if (!len) - return (struct htx_ret){.ret = 0, .blk = NULL}; - - /* get the tail and head block */ - tailblk = htx_get_tail_blk(htx); - if (tailblk == NULL) - goto rsv_new_block; - sz = htx_get_blksz(tailblk); - - /* Don't try to append data if the last inserted block is not of the - * same type */ - if (htx_get_blk_type(tailblk) != HTX_BLK_DATA) - goto rsv_new_block; - - /* - * Same type and enough space: append data - */ - if (!htx->head_addr) { - if (tailblk->addr+sz != htx->tail_addr) - goto rsv_new_block; - room = (htx_pos_to_addr(htx, htx->tail) - htx->tail_addr); - } - else { - if (tailblk->addr+sz != htx->head_addr) - goto rsv_new_block; - room = (htx->end_addr - htx->head_addr); - } - BUG_ON((int32_t)room < 0); - if (room < len) - len = room; + struct htx_blk *blk, *tailblk; + uint32_t sz, room; + int32_t len = htx_free_data_space(htx); - append_data: - htx_change_blk_value_len(htx, tailblk, sz+len); - - BUG_ON((int32_t)htx->tail_addr < 0); - BUG_ON((int32_t)htx->head_addr < 0); - BUG_ON(htx->end_addr > htx->tail_addr); - BUG_ON(htx->head_addr > htx->end_addr); - return (struct htx_ret){.ret = sz, .blk = tailblk}; - - rsv_new_block: - blk = htx_add_blk(htx, HTX_BLK_DATA, len); - if (!blk) - return (struct htx_ret){.ret = 0, .blk = NULL}; - blk->info += len; - return (struct htx_ret){.ret = 0, .blk = blk}; + if (htx->head == -1) + goto rsv_new_block; + + if (!len) + return (struct htx_ret){.ret = 0, .blk = NULL}; + + /* get the tail and head block */ + tailblk = htx_get_tail_blk(htx); + if (tailblk == NULL) + goto rsv_new_block; + sz = htx_get_blksz(tailblk); + + /* Don't try to append data if the last inserted block is not of the + * same type */ + if (htx_get_blk_type(tailblk) != HTX_BLK_DATA) + goto rsv_new_block; + + /* + * Same type and enough space: append data + */ + if (!htx->head_addr) { + if (tailblk->addr+sz != htx->tail_addr) + goto rsv_new_block; + room = (htx_pos_to_addr(htx, htx->tail) - htx->tail_addr); + } + else { + if (tailblk->addr+sz != htx->head_addr) + goto rsv_new_block; + room = (htx->end_addr - htx->head_addr); + } + BUG_ON((int32_t)room < 0); + if (room < len) + len = room; + +append_data: + htx_change_blk_value_len(htx, tailblk, sz+len); + + BUG_ON((int32_t)htx->tail_addr < 0); + BUG_ON((int32_t)htx->head_addr < 0); + BUG_ON(htx->end_addr > htx->tail_addr); + BUG_ON(htx->head_addr > htx->end_addr); + return (struct htx_ret){.ret = sz, .blk = tailblk}; + +rsv_new_block: + blk = htx_add_blk(htx, HTX_BLK_DATA, len); + if (!blk) + return (struct htx_ret){.ret = 0, .blk = NULL}; + blk->info += len; + return (struct htx_ret){.ret = 0, .blk = blk}; } /* Adds an HTX block of type DATA in . It first tries to append data if