mirror of
https://github.com/samba-team/samba.git
synced 2025-02-04 17:47:26 +03:00
Fix tower length calculations and add some const
(This used to be commit 2f84c6c9a1c292535e73721a8bcdb27aaa2b2b46)
This commit is contained in:
parent
b227a561f7
commit
ba0c899510
@ -175,12 +175,12 @@ NTSTATUS init_epm_tower(TALLOC_CTX *ctx, EPM_TOWER *tower,
|
|||||||
|
|
||||||
DEBUG(5, ("init_epm_tower\n"));
|
DEBUG(5, ("init_epm_tower\n"));
|
||||||
|
|
||||||
|
size += sizeof(uint16); /* number of floors is in tower length */
|
||||||
for (i = 0; i < num_floors; i++) {
|
for (i = 0; i < num_floors; i++) {
|
||||||
size += (sizeof(uint32) * 2);
|
size += (sizeof(uint16) * 2);
|
||||||
size += floors[i].lhs.length;
|
size += floors[i].lhs.length;
|
||||||
size += floors[i].rhs.length;
|
size += floors[i].rhs.length;
|
||||||
}
|
}
|
||||||
size += sizeof(uint8); /* this could be aligning... */
|
|
||||||
|
|
||||||
tower->referent_id = ++internal_referent_id;
|
tower->referent_id = ++internal_referent_id;
|
||||||
tower->max_length = tower->length = size;
|
tower->max_length = tower->length = size;
|
||||||
@ -345,7 +345,8 @@ NTSTATUS init_epm_q_map(TALLOC_CTX *ctx, EPM_Q_MAP *q_map,
|
|||||||
/*****************************************************************
|
/*****************************************************************
|
||||||
epm_io_q_map - read or write EPM_Q_MAP structure
|
epm_io_q_map - read or write EPM_Q_MAP structure
|
||||||
******************************************************************/
|
******************************************************************/
|
||||||
BOOL epm_io_q_map(char *desc, EPM_Q_MAP *io_map, prs_struct *ps, int depth)
|
BOOL epm_io_q_map(const char *desc, EPM_Q_MAP *io_map, prs_struct *ps,
|
||||||
|
int depth)
|
||||||
{
|
{
|
||||||
prs_debug(ps, depth, desc, "epm_io_q_map");
|
prs_debug(ps, depth, desc, "epm_io_q_map");
|
||||||
depth++;
|
depth++;
|
||||||
@ -373,7 +374,7 @@ BOOL epm_io_q_map(char *desc, EPM_Q_MAP *io_map, prs_struct *ps, int depth)
|
|||||||
/*******************************************************************
|
/*******************************************************************
|
||||||
epm_io_r_map - Read/Write EPM_R_MAP structure
|
epm_io_r_map - Read/Write EPM_R_MAP structure
|
||||||
******************************************************************/
|
******************************************************************/
|
||||||
BOOL epm_io_r_map(char *desc, EPM_R_MAP *io_map,
|
BOOL epm_io_r_map(const char *desc, EPM_R_MAP *io_map,
|
||||||
prs_struct *ps, int depth)
|
prs_struct *ps, int depth)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user