← Back to branch summary

~ubuntu-branches/ubuntu/karmic/nss/karmic-updates

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/util/nssrwlk.c

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack, Fabien Tassin, Alexander Sack
  • Date: 2009-01-11 15:06:17 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090111150617-iz4lw05qgy2odorl
Tags: 3.12.2~rc1-0ubuntu1
* New upstream snapshot: 3.12.2 RC1

[ Fabien Tassin <fta@ubuntu.com> ]
* Remove patch applied upstream:
  - drop debian/patches/80_security_tools.patch
  - update debian/patches/series
* Update diverged patches:
  - update debian/patches/38_kbsd.patch
  - update debian/patches/38_mips64_build.patch
* Add new symbols to symbols file
  - update debian/libnss3-1d.symbols

[ Alexander Sack <asac@ubuntu.com> ]
* disable soname patch to become binary compatible with upstream
  - update debian/patches/series
* flip links: libnss3.so <- libnss3.so.1d (before: libnss3.so ->
  libnss3.so.1d); same link flipping was done for all other previously
  soname patched libs: libnssutil3.so, libsmime3.so.1d, libssl3.so.1d
  - update debian/libnss3-1d.links
  - update debian/libnss3-1d.symbols
* properly transition links in preinst and postrm; also cover abort-
  cases in the other maintainer scripts
  - add debian/libnss3-1d.postinst
  - add debian/libnss3-1d.postrm
  - add debian/libnss3-1d.preinst
  - add debian/libnss3-1d.prerm
* remove hack from debian/rules that debian uses to recreate
  libsoftokn3.so with a versioned SONAME
  - update debian/rules
* install the unversioned .so binaries
  - update debian/rules
* only install the 4 main libraries into /usr/lib; all the others
  go to pkglibdir
  - update debian/rules
* higher bar for libnspr4 Build-Depend to >= 4.7.3~, which is
  the version where the soname droppage is going to happen
  - update debian/control
* explitily pass libraries to be used for dpkg-gensymbols run of
  dh_makeshlibs
  - update debian/rules
* fix lintian complain about no-shlibs-control-file
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/util/nssrwlk.c
101
101
 *
102
102
 */
103
103
 
104
 
PR_IMPLEMENT(NSSRWLock *)
 
104
NSSRWLock *
105
105
NSSRWLock_New(PRUint32 lock_rank, const char *lock_name)
106
106
{
107
107
    NSSRWLock *rwlock;
147
147
/*
148
148
** Destroy the given RWLock "lock".
149
149
*/
150
 
PR_IMPLEMENT(void)
 
150
void
151
151
NSSRWLock_Destroy(NSSRWLock *rwlock)
152
152
{
153
153
    PR_ASSERT(rwlock != NULL);
169
169
/*
170
170
** Read-lock the RWLock.
171
171
*/
172
 
PR_IMPLEMENT(void)
 
172
void
173
173
NSSRWLock_LockRead(NSSRWLock *rwlock)
174
174
{
175
175
    PRThread *me = PR_GetCurrentThread();
207
207
 
208
208
/* Unlock a Read lock held on this RW lock.
209
209
*/
210
 
PR_IMPLEMENT(void)
 
210
void
211
211
NSSRWLock_UnlockRead(NSSRWLock *rwlock)
212
212
{
213
213
    PZ_Lock(rwlock->rw_lock);
236
236
/*
237
237
** Write-lock the RWLock.
238
238
*/
239
 
PR_IMPLEMENT(void)
 
239
void
240
240
NSSRWLock_LockWrite(NSSRWLock *rwlock)
241
241
{
242
242
    PRThread *me = PR_GetCurrentThread();
286
286
 
287
287
/* Unlock a Read lock held on this RW lock.
288
288
*/
289
 
PR_IMPLEMENT(void)
 
289
void
290
290
NSSRWLock_UnlockWrite(NSSRWLock *rwlock)
291
291
{
292
292
    PRThread *me = PR_GetCurrentThread();
321
321
}
322
322
 
323
323
/* This is primarily for debugging, i.e. for inclusion in ASSERT calls. */
324
 
PR_IMPLEMENT(PRBool)
 
324
PRBool
325
325
NSSRWLock_HaveWriteLock(NSSRWLock *rwlock) {
326
326
    PRBool ownWriteLock;
327
327
    PRThread *me = PR_GetCurrentThread();