corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 941405 - Remove the usages of the register keyword from XPCOM; r=froydnj

Browse Source
This commit is contained in:
Ehsan Akhgari
2013-11-21 10:42:40 -05:00
parent 6501083b46
commit 1b131491ff
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xpcom/glue/nsQuickSort.cpp
View File

@@ -56,10 +56,10 @@ static INLINE void swapfunc(char *, char *, int, int);
*/ */
#define swapcode(TYPE, parmi, parmj, n) { \ #define swapcode(TYPE, parmi, parmj, n) { \
long i = (n) / sizeof (TYPE); \ long i = (n) / sizeof (TYPE); \
register TYPE *pi = (TYPE *) (parmi); \ TYPE *pi = (TYPE *) (parmi); \
register TYPE *pj = (TYPE *) (parmj); \ TYPE *pj = (TYPE *) (parmj); \
do { \ do { \
register TYPE t = *pi; \ TYPE t = *pi; \
*pi++ = *pj; \ *pi++ = *pj; \
*pj++ = t; \ *pj++ = t; \
} while (--i > 0); \ } while (--i > 0); \

10
xpcom/io/nsEscape.cpp
View File

@@ -53,7 +53,7 @@ static char* nsEscapeCount(
size_t i, len = 0, charsToEscape = 0; size_t i, len = 0, charsToEscape = 0;
static const char hexChars[] = "0123456789ABCDEF"; static const char hexChars[] = "0123456789ABCDEF";
register const unsigned char* src = (const unsigned char *) str; const unsigned char* src = (const unsigned char *) str;
while (*src) while (*src)
{ {
len++; len++;
@@ -82,7 +82,7 @@ static char* nsEscapeCount(
if (!result) if (!result)
return 0; return 0;
register unsigned char* dst = (unsigned char *) result; unsigned char* dst = (unsigned char *) result;
src = (const unsigned char *) str; src = (const unsigned char *) str;
if (flags == url_XPAlphas) if (flags == url_XPAlphas)
{ {
@@ -144,8 +144,8 @@ char* nsUnescape(char * str)
int32_t nsUnescapeCount(char * str) int32_t nsUnescapeCount(char * str)
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
{ {
register char *src = str; char *src = str;
register char *dst = str; char *dst = str;
static const char hexChars[] = "0123456789ABCDEFabcdef"; static const char hexChars[] = "0123456789ABCDEFabcdef";
char c1[] = " "; char c1[] = " ";
@@ -379,7 +379,7 @@ bool NS_EscapeURL(const char *part,
bool writing = !!(flags & esc_AlwaysCopy); bool writing = !!(flags & esc_AlwaysCopy);
bool colon = !!(flags & esc_Colon); bool colon = !!(flags & esc_Colon);
register const unsigned char* src = (const unsigned char *) part; const unsigned char* src = (const unsigned char *) part;
char tempBuffer[100]; char tempBuffer[100];
unsigned int tempBufferPos = 0; unsigned int tempBufferPos = 0;

12
xpcom/io/nsWildCard.cpp
View File

@@ -60,7 +60,7 @@ template<class T>
static int static int
_valid_subexp(const T *expr, T stop1, T stop2) _valid_subexp(const T *expr, T stop1, T stop2)
{ {
register int x; int x;
int nsc = 0; /* Number of special characters */ int nsc = 0; /* Number of special characters */
int np; /* Number of pipe characters in union */ int np; /* Number of pipe characters in union */
int tld = 0; /* Number of tilde characters */ int tld = 0; /* Number of tilde characters */
@@ -174,8 +174,8 @@ template<class T>
static int static int
_scan_and_copy(const T *expr, T stop1, T stop2, T *dest) _scan_and_copy(const T *expr, T stop1, T stop2, T *dest)
{ {
register int sx; /* source index */ int sx; /* source index */
register T cc; T cc;
for (sx = 0; (cc = expr[sx]) && cc != stop1 && cc != stop2; sx++) { for (sx = 0; (cc = expr[sx]) && cc != stop1 && cc != stop2; sx++) {
if (cc == '\\') { if (cc == '\\') {
@@ -212,7 +212,7 @@ static int
_handle_union(const T *str, const T *expr, bool case_insensitive, _handle_union(const T *str, const T *expr, bool case_insensitive,
unsigned int level) unsigned int level)
{ {
register int sx; /* source index */ int sx; /* source index */
int cp; /* source index of closing parenthesis */ int cp; /* source index of closing parenthesis */
int count; int count;
int ret = NOMATCH; int ret = NOMATCH;
@@ -263,8 +263,8 @@ static int
_shexp_match(const T *str, const T *expr, bool case_insensitive, _shexp_match(const T *str, const T *expr, bool case_insensitive,
unsigned int level) unsigned int level)
{ {
register int x; /* input string index */ int x; /* input string index */
register int y; /* expression index */ int y; /* expression index */
int ret,neg; int ret,neg;
if (level > 20) /* Don't let the stack get too deep. */ if (level > 20) /* Don't let the stack get too deep. */

4
xpcom/reflect/xptcall/src/md/test/stub_test.cpp
View File

@@ -168,8 +168,8 @@ PrepareAndDispatch(baz* self, uint32_t methodIndex, uint32_t* args)
#define STUB_ENTRY(n) \ #define STUB_ENTRY(n) \
nsresult baz::callme##n() \ nsresult baz::callme##n() \
{ \ { \
register void* method = PrepareAndDispatch; \ void* method = PrepareAndDispatch; \
register nsresult result; \ nsresult result; \
__asm__ __volatile__( \ __asm__ __volatile__( \
"leal 0x0c(%%ebp), %%ecx\n\t" /* args */ \ "leal 0x0c(%%ebp), %%ecx\n\t" /* args */ \
"pushl %%ecx\n\t" \ "pushl %%ecx\n\t" \

4
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
View File

@@ -140,8 +140,8 @@ NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
* *
*/ */
register vtable_func *vtable, func; vtable_func *vtable, func;
register int base_size = (paramCount > 1) ? paramCount : 2; int base_size = (paramCount > 1) ? paramCount : 2;
/* !!! IMPORTANT !!! /* !!! IMPORTANT !!!
* On DEBUG builds, the NS_ASSERTION used in invoke_copy_to_stack needs to use * On DEBUG builds, the NS_ASSERTION used in invoke_copy_to_stack needs to use