Update to NSPR 4.10.4.

nspr/pr/src/misc/prcountr.c

 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
 ** prcountr.c -- NSPR Instrumentation Counters
 **
 ** Implement the interface defined in prcountr.h
 **
@@ skipping 127 matching lines @@
     if (!PR_CLIST_IS_EMPTY( &qNameList ))
     {
         qnp = (QName *) PR_LIST_HEAD( &qNameList );
         do {
             if ( strcmp(qnp->name, qName) == 0)
             {
                 matchQname = PR_TRUE;
                 break;
             }
             qnp = (QName *)PR_NEXT_LINK( &qnp->link );
-        } while( qnp != (QName *)PR_LIST_HEAD( &qNameList ));
+        } while( qnp != (QName *)&qNameList );
     }
     /*
     ** If we did not find a matching QName,
     **    allocate one and initialize it.
     **    link it onto the qNameList.
     **
     */
     if ( matchQname != PR_TRUE )
     {
         qnp = PR_NEWZAP( QName );
         PR_ASSERT( qnp != NULL );
         PR_INIT_CLIST( &qnp->link ); 
         PR_INIT_CLIST( &qnp->rNameList ); 
         strcpy( qnp->name, qName );
         PR_APPEND_LINK( &qnp->link, &qNameList ); 
     }
 
     /* Do we already have a matching RName? */
     if (!PR_CLIST_IS_EMPTY( &qnp->rNameList ))
     {
         rnp = (RName *) PR_LIST_HEAD( &qnp->rNameList );
         do {
             /*
             ** No duplicate RNames are allowed within a QName
             **
             */
             PR_ASSERT( strcmp(rnp->name, rName));
             rnp = (RName *)PR_NEXT_LINK( &rnp->link );
-        } while( rnp != (RName *)PR_LIST_HEAD( &qnp->rNameList ));
+        } while( rnp != (RName *)&qnp->rNameList );
     }
 
     /* Get a new RName structure; initialize its members */
     rnp = PR_NEWZAP( RName );
     PR_ASSERT( rnp != NULL );
     PR_INIT_CLIST( &rnp->link );
     strcpy( rnp->name, rName );
     strcpy( rnp->desc, description );
     rnp->lock = PR_NewLock();
     if ( rnp->lock == NULL )
@@ skipping 277 matching lines @@
     else if ( PR_NEXT_LINK( &rnp->link ) ==  &qnp->rNameList )
         rnp = NULL;
     else
         rnp = (RName *)PR_NEXT_LINK( &rnp->link );
 
     PR_LOG( lm, PR_LOG_DEBUG, ("PR_Counter: FindNextRname: Rhandle: %p, QHandle: %p, Returns: %p", 
         rhandle, qhandle, rnp ));
 
     return((PRCounterHandle)rnp);
 } /*  end PR_FindNextCounterRname() */