Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 17:25:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1442363, part 8 - Constify XPTMethodDescriptor::params. r=njn

Browse Source 
MozReview-Commit-ID: 3PvMeJW2P50

--HG--
extra : rebase_source : a8a617e0fb58c27690bcb2cc9a3e256efaaedf07
This commit is contained in:
Andrew McCreight 2018-02-27 15:54:17 -08:00
parent 9e8f62c285
commit 1a05744852
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xpcom/typelib/xpt/xpt_struct.cpp
View File

@ -353,18 +353,22 @@ DoMethodDescriptor(XPTArena *arena, NotNull<XPTCursor*> cursor,
!XPT_Do8(cursor, &md->num_args))
return false;
XPTParamDescriptor* params = nullptr;
if (md->num_args) {
size_t n = md->num_args * sizeof(XPTParamDescriptor);
md->params = static_cast<XPTParamDescriptor*>(XPT_CALLOC8(arena, n));
if (!md->params)
params = static_cast<XPTParamDescriptor*>(XPT_CALLOC8(arena, n));
if (!params)
return false;
}
for(i = 0; i < md->num_args; i++) {
if (!DoParamDescriptor(arena, cursor, &md->params[i], id))
if (!DoParamDescriptor(arena, cursor, &params[i], id))
return false;
}
md->params = params;
// |result| appears in the on-disk format but it isn't used,
// because a method is either notxpcom, in which case it can't be
// called from script so the XPT information is irrelevant, or the

2
xpcom/typelib/xpt/xpt_struct.h
View File

@ -267,7 +267,7 @@ struct XPTParamDescriptor {
*/
struct XPTMethodDescriptor {
const char* name;
XPTParamDescriptor* params;
const XPTParamDescriptor* params;
//XPTParamDescriptor result; // Present on disk, omitted here.
uint8_t flags;
uint8_t num_args;