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

xpcom/glue/nsQuickSort.cpp

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

xpcom/io/nsEscape.cpp

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

xpcom/io/nsWildCard.cpp

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

xpcom/reflect/xptcall/src/md/test/stub_test.cpp

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

xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp

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