← 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/libpkix/pkix/util/pkix_error.c

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2009-06-16 13:23:47 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20090616132347-311ysb8oep74b98y
Tags: 3.12.3-0ubuntu1
https://launchpad.net/bugs/387751
* new upstream release 3.12.3 RTM (NSS_3_12_3_RTM) (LP: #387751)
* adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
* needs nspr >= 4.7.4
  - update debian/control
* update 85_security_load.patch to latest debian version
  - update debian/patches/85_security_load.patch
* add new symbols for 3.12.3
  - update debian/libnss3-1d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/libpkix/pkix/util/pkix_error.c
47
47
 
48
48
#define PKIX_ERRORENTRY(name,desc,nsserr) #desc
49
49
 
 
50
#if defined PKIX_ERROR_DESCRIPTION
 
51
 
50
52
const char * const PKIX_ErrorText[] =
51
53
{
52
54
#include "pkix_errorstrings.h"
53
55
};
54
56
 
 
57
#else
 
58
 
 
59
#include "prprf.h"
 
60
 
 
61
#endif /* PKIX_ERROR_DESCRIPTION */
 
62
 
55
63
extern const int PKIX_PLErrorIndex[];
56
64
 
57
65
/* --Private-Functions-------------------------------------------- */
563
571
        void *plContext)
564
572
{
565
573
        PKIX_PL_String *descString = NULL;
 
574
#ifndef PKIX_ERROR_DESCRIPTION
 
575
        char errorStr[32];
 
576
#endif
566
577
 
567
578
        PKIX_ENTER(ERROR, "PKIX_Error_GetDescription");
568
579
        PKIX_NULLCHECK_TWO(error, pDesc);
569
580
 
 
581
#ifndef PKIX_ERROR_DESCRIPTION
 
582
        PR_snprintf(errorStr, 32, "Error code: %d", error->errCode);
 
583
#endif
 
584
 
570
585
        PKIX_PL_String_Create(PKIX_ESCASCII,
 
586
#if defined PKIX_ERROR_DESCRIPTION
571
587
                              (void *)PKIX_ErrorText[error->errCode],
 
588
#else
 
589
                              errorStr,
 
590
#endif
572
591
                              0,
573
592
                              &descString,
574
593
                              plContext);