Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1438707, part 3 - De-macroize CURS_POINT. r=njn

Browse Source 
MozReview-Commit-ID: CVBGPRVSF7s

--HG--
extra : rebase_source : 74cbfe8d1925caf6f24f410caaebe719624fa41a
This commit is contained in:
Andrew McCreight 2018-02-14 13:18:12 -08:00
parent 598d1fd20b
commit c15a70af69
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xpcom/typelib/xpt/xpt_xdr.cpp
View File

@ -20,9 +20,11 @@
#define CURS_POOL_OFFSET(cursor) \
(CURS_POOL_OFFSET_RAW(cursor) - 1)
/* can be used as lvalue */
#define CURS_POINT(cursor) \
((cursor)->state->pool_data[CURS_POOL_OFFSET(cursor)])
static char*
CursPoint(NotNull<XPTCursor*> cursor)
{
return &cursor->state->pool_data[CURS_POOL_OFFSET(cursor)];
}
static bool
CheckCount(NotNull<XPTCursor*> cursor, uint32_t space)
@ -117,7 +119,7 @@ XPT_DoCString(XPTArena *arena, NotNull<XPTCursor*> cursor, char **identp,
my_cursor.pool = XPT_DATA;
my_cursor.offset = offset;
my_cursor.state = cursor->state;
char* start = &CURS_POINT(&my_cursor);
char* start = CursPoint(WrapNotNull(&my_cursor));
char* end = strchr(start, 0); /* find the end of the string */
if (!end) {
@ -181,7 +183,7 @@ XPT_DoIID(NotNull<XPTCursor*> cursor, nsID *iidp)
return false; \
} \
\
*valuep = func(&CURS_POINT(cursor)); \
*valuep = func(CursPoint(cursor)); \
cursor->offset += sz; \
return true; \
} while(0)
@ -218,7 +220,7 @@ XPT_Do8(NotNull<XPTCursor*> cursor, uint8_t *u8p)
if (!CheckCount(cursor, 1))
return false;
*u8p = CURS_POINT(cursor);
*u8p = *CursPoint(cursor);
cursor->offset++;