Skip to content

Commit fbf3249

Browse files
committed
mapi_lib: add missing const qualifiers for (de)serializer functions
1 parent ff6396f commit fbf3249

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

exch/emsmdb/rop_ext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ static pack_result rop_ext_pull(EXT_PULL &x, MODIFYRECIPIENTS_REQUEST &r)
710710
}
711711
}
712712
for (size_t i = 0; i < r.count; ++i)
713-
TRY(x.g_modrcpt_row(&r.proptags, &r.prow[i]));
713+
TRY(x.g_modrcpt_row(r.proptags, &r.prow[i]));
714714
return pack_result::ok;
715715
}
716716

include/gromox/ext_buffer.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ struct GX_EXPORT EXT_PULL {
172172
pack_result g_propval(uint16_t type, void **);
173173
pack_result g_tagged_pv(TAGGED_PROPVAL *);
174174
pack_result g_flagged_pv(uint16_t type, FLAGGED_PROPVAL *);
175-
pack_result g_proprow(const PROPTAG_ARRAY *cols, PROPERTY_ROW *);
175+
pack_result g_proprow(const PROPTAG_ARRAY &cols, PROPERTY_ROW *);
176176
pack_result g_propname(PROPERTY_NAME *);
177177
pack_result g_propname_a(PROPNAME_ARRAY *);
178178
pack_result g_propid_a(PROPID_ARRAY *);
@@ -185,8 +185,8 @@ struct GX_EXPORT EXT_PULL {
185185
pack_result g_msg_eid(MESSAGE_ENTRYID *);
186186
pack_result g_sortorder(SORT_ORDER *);
187187
pack_result g_sortorder_set(SORTORDER_SET *);
188-
pack_result g_recipient_row(const PROPTAG_ARRAY *tags, RECIPIENT_ROW *);
189-
pack_result g_modrcpt_row(PROPTAG_ARRAY *tag, MODIFYRECIPIENT_ROW *);
188+
pack_result g_recipient_row(const PROPTAG_ARRAY &tags, RECIPIENT_ROW *);
189+
pack_result g_modrcpt_row(const PROPTAG_ARRAY &tags, MODIFYRECIPIENT_ROW *);
190190
pack_result g_permission_data(PERMISSION_DATA *);
191191
pack_result g_rule_data(RULE_DATA *);
192192
pack_result g_abk_eid(EMSAB_ENTRYID *);

lib/mapi/ext_buffer.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,8 +1536,9 @@ pack_result EXT_PULL::g_flagged_pv(uint16_t type, FLAGGED_PROPVAL *r)
15361536
}
15371537
}
15381538

1539-
pack_result EXT_PULL::g_proprow(const PROPTAG_ARRAY *pcolumns, PROPERTY_ROW *r)
1539+
pack_result EXT_PULL::g_proprow(const PROPTAG_ARRAY &cols, PROPERTY_ROW *r)
15401540
{
1541+
auto pcolumns = &cols;
15411542
TRY(g_uint8(&r->flag));
15421543
r->pppropval = anew<void *>(pcolumns->count);
15431544
if (r->pppropval == nullptr)
@@ -1584,8 +1585,9 @@ pack_result EXT_PULL::g_sortorder_set(SORTORDER_SET *r)
15841585
return pack_result::ok;
15851586
}
15861587

1587-
pack_result EXT_PULL::g_recipient_row(const PROPTAG_ARRAY *pproptags, RECIPIENT_ROW *r)
1588+
pack_result EXT_PULL::g_recipient_row(const PROPTAG_ARRAY &tags, RECIPIENT_ROW *r)
15881589
{
1590+
auto pproptags = &tags;
15891591
uint8_t type;
15901592
BOOL b_unicode;
15911593
PROPTAG_ARRAY proptags;
@@ -1663,10 +1665,10 @@ pack_result EXT_PULL::g_recipient_row(const PROPTAG_ARRAY *pproptags, RECIPIENT_
16631665
return pack_result::format;
16641666
proptags.count = r->count;
16651667
proptags.pproptag = deconst(pproptags->pproptag);
1666-
return g_proprow(&proptags, &r->properties);
1668+
return g_proprow(proptags, &r->properties);
16671669
}
16681670

1669-
pack_result EXT_PULL::g_modrcpt_row(PROPTAG_ARRAY *pproptags, MODIFYRECIPIENT_ROW *r)
1671+
pack_result EXT_PULL::g_modrcpt_row(const PROPTAG_ARRAY &tags, MODIFYRECIPIENT_ROW *r)
16701672
{
16711673
uint16_t row_size;
16721674

@@ -1681,7 +1683,7 @@ pack_result EXT_PULL::g_modrcpt_row(PROPTAG_ARRAY *pproptags, MODIFYRECIPIENT_RO
16811683
r->precipient_row = anew<RECIPIENT_ROW>();
16821684
if (r->precipient_row == nullptr)
16831685
return pack_result::alloc;
1684-
TRY(g_recipient_row(pproptags, r->precipient_row));
1686+
TRY(g_recipient_row(tags, r->precipient_row));
16851687
if (m_offset > offset)
16861688
return pack_result::format;
16871689
m_offset = offset;

0 commit comments

Comments
 (0)