RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-23 13:17:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: shctx: Change max. object size type to unsigned int.

Browse Source 
This change is there to prevent implicit conversions when comparing
shctx maximum object sizes with other unsigned values.
This commit is contained in:
Frdric Lcaille 2018-10-25 20:31:40 +02:00 committed by Willy Tarreau
parent 4eba544e24
commit b80bc273a3
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/proto/shctx.h
View File

@ -32,7 +32,8 @@
#endif
int shctx_init(struct shared_context **orig_shctx,
int maxblocks, int blocksize, int maxobjsz, int extra, int shared);
int maxblocks, int blocksize, unsigned int maxobjsz,
int extra, int shared);
struct shared_block *shctx_row_reserve_hot(struct shared_context *shctx,
struct shared_block *last, int data_len);
void shctx_row_inc_hot(struct shared_context *shctx, struct shared_block *first);

2
include/types/shctx.h
View File

@ -40,7 +40,7 @@ struct shared_context {
struct list avail; /* list for active and free blocks */
struct list hot; /* list for locked blocks */
unsigned int nbav; /* number of available blocks */
int max_obj_size; /* maximum object size. */
unsigned int max_obj_size; /* maximum object size (in bytes). */
void (*free_block)(struct shared_block *first, struct shared_block *block);
short int block_size;
unsigned char data[0];

4
src/shctx.c
View File

@ -292,7 +292,7 @@ int shctx_row_data_get(struct shared_context *shctx, struct shared_block *first,
* and 0 if cache is already allocated.
*/
int shctx_init(struct shared_context **orig_shctx, int maxblocks, int blocksize,
int maxobjsz, int extra, int shared)
unsigned int maxobjsz, int extra, int shared)
{
int i;
struct shared_context *shctx;
@ -359,7 +359,7 @@ int shctx_init(struct shared_context **orig_shctx, int maxblocks, int blocksize,
LIST_INIT(&shctx->hot);
shctx->block_size = blocksize;
shctx->max_obj_size = maxobjsz;
shctx->max_obj_size = maxobjsz == (unsigned int)-1 ? 0 : maxobjsz;
/* init the free blocks after the shared context struct */
cur = (void *)shctx + sizeof(struct shared_context) + extra;