Skip to content

Commit c97da70

Browse files
committed
mapi_lib: un-overload function name for LTPROPVAL_ARRAY (de)serialization
1 parent e5de46f commit c97da70

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

exch/mh/nsp_ops.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ pack_result nsp_ext_pull::g_nsp_request(modprops_request &req)
377377
req.values = anew<LTPROPVAL_ARRAY>();
378378
if (req.values == nullptr)
379379
return pack_result::alloc;
380-
TRY(g_tpropval_a(req.values));
380+
TRY(g_tpropval_la(req.values));
381381
}
382382
TRY(g_uint32(&req.cb_auxin));
383383
if (req.cb_auxin == 0) {
@@ -756,7 +756,7 @@ pack_result nsp_ext_push::p_nsp_response(const getprops_response &rsp)
756756
TRY(p_uint8(0));
757757
} else {
758758
TRY(p_uint8(0xFF));
759-
TRY(p_tpropval_a(*rsp.row));
759+
TRY(p_tpropval_la(*rsp.row));
760760
}
761761
return p_uint32(0);
762762
}
@@ -779,7 +779,7 @@ pack_result nsp_ext_push::p_nsp_response(const getspecialtable_response &rsp)
779779
TRY(p_uint8(0xFF));
780780
TRY(p_uint32(rsp.count));
781781
for (size_t i = 0; i < rsp.count; ++i)
782-
TRY(p_tpropval_a(rsp.row[i]));
782+
TRY(p_tpropval_la(rsp.row[i]));
783783
}
784784
return p_uint32(0);
785785
}
@@ -794,7 +794,7 @@ pack_result nsp_ext_push::p_nsp_response(const gettemplateinfo_response &rsp)
794794
TRY(p_uint8(0));
795795
} else {
796796
TRY(p_uint8(0xFF));
797-
TRY(p_tpropval_a(*rsp.row));
797+
TRY(p_tpropval_la(*rsp.row));
798798
}
799799
return p_uint32(0);
800800
}

include/gromox/ext_buffer.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ struct GX_EXPORT EXT_PULL {
177177
pack_result g_propname_a(PROPNAME_ARRAY *);
178178
pack_result g_propid_a(PROPID_ARRAY *);
179179
pack_result g_tpropval_a(TPROPVAL_ARRAY *);
180-
pack_result g_tpropval_a(LTPROPVAL_ARRAY *);
180+
pack_result g_tpropval_la(LTPROPVAL_ARRAY *);
181181
pack_result g_tarray_set(TARRAY_SET *);
182182
pack_result g_problem_a(PROBLEM_ARRAY *);
183183
pack_result g_xid(uint8_t size, XID *);
@@ -296,7 +296,7 @@ struct GX_EXPORT EXT_PUSH {
296296
pack_result p_propname_a(const PROPNAME_ARRAY &);
297297
pack_result p_propid_a(const PROPID_ARRAY &);
298298
pack_result p_tpropval_a(const TPROPVAL_ARRAY &);
299-
pack_result p_tpropval_a(const LTPROPVAL_ARRAY &);
299+
pack_result p_tpropval_la(const LTPROPVAL_ARRAY &);
300300
pack_result p_tarray_set(const TARRAY_SET &);
301301
pack_result p_problem_a(const PROBLEM_ARRAY &);
302302
pack_result p_xid(const XID &);

lib/mapi/ext_buffer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@ pack_result EXT_PULL::g_tpropval_a(TPROPVAL_ARRAY *r)
12431243
return pack_result::ok;
12441244
}
12451245

1246-
pack_result EXT_PULL::g_tpropval_a(LTPROPVAL_ARRAY *r)
1246+
pack_result EXT_PULL::g_tpropval_la(LTPROPVAL_ARRAY *r)
12471247
{
12481248
TRY(g_uint32(&r->count));
12491249
if (r->count == 0) {
@@ -3003,7 +3003,7 @@ pack_result EXT_PUSH::p_tpropval_a(const TPROPVAL_ARRAY &r)
30033003
return pack_result::ok;
30043004
}
30053005

3006-
pack_result EXT_PUSH::p_tpropval_a(const LTPROPVAL_ARRAY &r)
3006+
pack_result EXT_PUSH::p_tpropval_la(const LTPROPVAL_ARRAY &r)
30073007
{
30083008
TRY(p_uint32(r.count));
30093009
for (size_t i = 0; i < r.count; ++i)

0 commit comments

Comments
 (0)