Added the error code into error messages

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@534 74dad513-b988-da41-8d7b-12977e46ad98

1 files changed, 77 insertions, 77 deletions

diff --git a/pjmedia/src/pjmedia/errno.c b/pjmedia/src/pjmedia/errno.c
index f7c5082e..4016fecb 100644
--- a/pjmedia/src/pjmedia/errno.c
+++ b/pjmedia/src/pjmedia/errno.c
@@ -37,101 +37,101 @@ static const struct
 } err_str[] = 
 {
     /* Generic PJMEDIA errors, shouldn't be used! */
-    { PJMEDIA_ERROR,		    "Unspecified PJMEDIA error" },
+    PJ_BUILD_ERR( PJMEDIA_ERROR,	    "Unspecified PJMEDIA error" ),
 
     /* SDP error. */
-    { PJMEDIA_SDP_EINSDP,	    "Invalid SDP descriptor" },
-    { PJMEDIA_SDP_EINVER,	    "Invalid SDP version line" },
-    { PJMEDIA_SDP_EINORIGIN,	    "Invalid SDP origin line" },
-    { PJMEDIA_SDP_EINTIME,	    "Invalid SDP time line"},
-    { PJMEDIA_SDP_EINNAME,	    "SDP name/subject line is empty"},
-    { PJMEDIA_SDP_EINCONN,	    "Invalid SDP connection line"},
-    { PJMEDIA_SDP_EMISSINGCONN,	    "Missing SDP connection info line"},
-    { PJMEDIA_SDP_EINATTR,	    "Invalid SDP attributes"},
-    { PJMEDIA_SDP_EINRTPMAP,	    "Invalid SDP rtpmap attribute"},
-    { PJMEDIA_SDP_ERTPMAPTOOLONG,   "SDP rtpmap attribute too long"},
-    { PJMEDIA_SDP_EMISSINGRTPMAP,   "Missing SDP rtpmap for dynamic payload type"},
-    { PJMEDIA_SDP_EINMEDIA,	    "Invalid SDP media line" },
-    { PJMEDIA_SDP_ENOFMT,	    "No SDP payload format in the media line" },
-    { PJMEDIA_SDP_EINPT,	    "Invalid SDP payload type in media line" },
-    { PJMEDIA_SDP_EINFMTP,	    "Invalid SDP fmtp attribute" },
+    PJ_BUILD_ERR( PJMEDIA_SDP_EINSDP,	    "Invalid SDP descriptor" ),
+    PJ_BUILD_ERR( PJMEDIA_SDP_EINVER,	    "Invalid SDP version line" ),
+    PJ_BUILD_ERR( PJMEDIA_SDP_EINORIGIN,    "Invalid SDP origin line" ),
+    PJ_BUILD_ERR( PJMEDIA_SDP_EINTIME,	    "Invalid SDP time line"),
+    PJ_BUILD_ERR( PJMEDIA_SDP_EINNAME,	    "SDP name/subject line is empty"),
+    PJ_BUILD_ERR( PJMEDIA_SDP_EINCONN,	    "Invalid SDP connection line"),
+    PJ_BUILD_ERR( PJMEDIA_SDP_EMISSINGCONN, "Missing SDP connection info line"),
+    PJ_BUILD_ERR( PJMEDIA_SDP_EINATTR,	    "Invalid SDP attributes"),
+    PJ_BUILD_ERR( PJMEDIA_SDP_EINRTPMAP,    "Invalid SDP rtpmap attribute"),
+    PJ_BUILD_ERR( PJMEDIA_SDP_ERTPMAPTOOLONG,"SDP rtpmap attribute too long"),
+    PJ_BUILD_ERR( PJMEDIA_SDP_EMISSINGRTPMAP,"Missing SDP rtpmap for dynamic payload type"),
+    PJ_BUILD_ERR( PJMEDIA_SDP_EINMEDIA,	    "Invalid SDP media line" ),
+    PJ_BUILD_ERR( PJMEDIA_SDP_ENOFMT,	    "No SDP payload format in the media line" ),
+    PJ_BUILD_ERR( PJMEDIA_SDP_EINPT,	    "Invalid SDP payload type in media line" ),
+    PJ_BUILD_ERR( PJMEDIA_SDP_EINFMTP,	    "Invalid SDP fmtp attribute" ),
 
     /* SDP negotiator errors. */
-    { PJMEDIA_SDPNEG_EINSTATE,	    "Invalid SDP negotiator state for operation" },
-    { PJMEDIA_SDPNEG_ENOINITIAL,    "No initial local SDP in SDP negotiator" },
-    { PJMEDIA_SDPNEG_ENOACTIVE,	    "No active SDP in SDP negotiator" },
-    { PJMEDIA_SDPNEG_ENONEG,	    "No current local/remote offer/answer" },
-    { PJMEDIA_SDPNEG_EMISMEDIA,	    "SDP media count mismatch in offer/answer" },
-    { PJMEDIA_SDPNEG_EINVANSMEDIA,  "SDP media type mismatch in offer/answer" },
-    { PJMEDIA_SDPNEG_EINVANSTP,	    "SDP media transport type mismatch in offer/answer" },
-    { PJMEDIA_SDPNEG_EANSNOMEDIA,   "No common SDP media payload in answer" },
-    { PJMEDIA_SDPNEG_ENOMEDIA,	    "No active media stream after negotiation" },
+    PJ_BUILD_ERR( PJMEDIA_SDPNEG_EINSTATE,	"Invalid SDP negotiator state for operation" ),
+    PJ_BUILD_ERR( PJMEDIA_SDPNEG_ENOINITIAL,	"No initial local SDP in SDP negotiator" ),
+    PJ_BUILD_ERR( PJMEDIA_SDPNEG_ENOACTIVE,	"No active SDP in SDP negotiator" ),
+    PJ_BUILD_ERR( PJMEDIA_SDPNEG_ENONEG,	"No current local/remote offer/answer" ),
+    PJ_BUILD_ERR( PJMEDIA_SDPNEG_EMISMEDIA,	"SDP media count mismatch in offer/answer" ),
+    PJ_BUILD_ERR( PJMEDIA_SDPNEG_EINVANSMEDIA,	"SDP media type mismatch in offer/answer" ),
+    PJ_BUILD_ERR( PJMEDIA_SDPNEG_EINVANSTP,	"SDP media transport type mismatch in offer/answer" ),
+    PJ_BUILD_ERR( PJMEDIA_SDPNEG_EANSNOMEDIA,	"No common SDP media payload in answer" ),
+    PJ_BUILD_ERR( PJMEDIA_SDPNEG_ENOMEDIA,	"No active media stream after negotiation" ),
 
     /* SDP comparison results */
-    { PJMEDIA_SDP_EMEDIANOTEQUAL,   "SDP media descriptor not equal" },
-    { PJMEDIA_SDP_EPORTNOTEQUAL,    "Port in SDP media descriptor not equal" },
-    { PJMEDIA_SDP_ETPORTNOTEQUAL,   "Transport in SDP media descriptor not equal" },
-    { PJMEDIA_SDP_EFORMATNOTEQUAL,  "Format in SDP media descriptor not equal" },
-    { PJMEDIA_SDP_ECONNNOTEQUAL,    "SDP connection line not equal" },
-    { PJMEDIA_SDP_EATTRNOTEQUAL,    "SDP attributes not equal" },
-    { PJMEDIA_SDP_EDIRNOTEQUAL,	    "SDP media direction not equal" },
-    { PJMEDIA_SDP_EFMTPNOTEQUAL,    "SDP fmtp attribute not equal" },
-    { PJMEDIA_SDP_ERTPMAPNOTEQUAL,  "SDP rtpmap attribute not equal" },
-    { PJMEDIA_SDP_ESESSNOTEQUAL,    "SDP session descriptor not equal" },
-    { PJMEDIA_SDP_EORIGINNOTEQUAL,  "SDP origin line not equal" },
-    { PJMEDIA_SDP_ENAMENOTEQUAL,    "SDP name/subject line not equal" },
-    { PJMEDIA_SDP_ETIMENOTEQUAL,    "SDP time line not equal" },
+    PJ_BUILD_ERR( PJMEDIA_SDP_EMEDIANOTEQUAL,   "SDP media descriptor not equal" ),
+    PJ_BUILD_ERR( PJMEDIA_SDP_EPORTNOTEQUAL,    "Port in SDP media descriptor not equal" ),
+    PJ_BUILD_ERR( PJMEDIA_SDP_ETPORTNOTEQUAL,   "Transport in SDP media descriptor not equal" ),
+    PJ_BUILD_ERR( PJMEDIA_SDP_EFORMATNOTEQUAL,  "Format in SDP media descriptor not equal" ),
+    PJ_BUILD_ERR( PJMEDIA_SDP_ECONNNOTEQUAL,    "SDP connection line not equal" ),
+    PJ_BUILD_ERR( PJMEDIA_SDP_EATTRNOTEQUAL,    "SDP attributes not equal" ),
+    PJ_BUILD_ERR( PJMEDIA_SDP_EDIRNOTEQUAL,     "SDP media direction not equal" ),
+    PJ_BUILD_ERR( PJMEDIA_SDP_EFMTPNOTEQUAL,    "SDP fmtp attribute not equal" ),
+    PJ_BUILD_ERR( PJMEDIA_SDP_ERTPMAPNOTEQUAL,  "SDP rtpmap attribute not equal" ),
+    PJ_BUILD_ERR( PJMEDIA_SDP_ESESSNOTEQUAL,    "SDP session descriptor not equal" ),
+    PJ_BUILD_ERR( PJMEDIA_SDP_EORIGINNOTEQUAL,  "SDP origin line not equal" ),
+    PJ_BUILD_ERR( PJMEDIA_SDP_ENAMENOTEQUAL,    "SDP name/subject line not equal" ),
+    PJ_BUILD_ERR( PJMEDIA_SDP_ETIMENOTEQUAL,    "SDP time line not equal" ),
 
     /* Codec errors. */
-    { PJMEDIA_CODEC_EUNSUP,	    "Unsupported media codec" },
-    { PJMEDIA_CODEC_EFAILED,	    "Codec internal creation error" },
-    { PJMEDIA_CODEC_EFRMTOOSHORT,   "Codec frame is too short" },
-    { PJMEDIA_CODEC_EPCMTOOSHORT,   "PCM frame is too short" },
-    { PJMEDIA_CODEC_EFRMINLEN,	    "Invalid codec frame length" },
+    PJ_BUILD_ERR( PJMEDIA_CODEC_EUNSUP,		"Unsupported media codec" ),
+    PJ_BUILD_ERR( PJMEDIA_CODEC_EFAILED,	"Codec internal creation error" ),
+    PJ_BUILD_ERR( PJMEDIA_CODEC_EFRMTOOSHORT,   "Codec frame is too short" ),
+    PJ_BUILD_ERR( PJMEDIA_CODEC_EPCMTOOSHORT,   "PCM frame is too short" ),
+    PJ_BUILD_ERR( PJMEDIA_CODEC_EFRMINLEN,      "Invalid codec frame length" ),
 
     /* Media errors. */
-    { PJMEDIA_EINVALIDIP,	    "Invalid remote media (IP) address" },
-    { PJMEDIA_EASYMCODEC,	    "Asymetric media codec is not supported" },
-    { PJMEDIA_EINVALIDPT,	    "Invalid media payload type" },
-    { PJMEDIA_EMISSINGRTPMAP,	    "Missing rtpmap in media description" },
-    { PJMEDIA_EINVALIMEDIATYPE,	    "Invalid media type" },
-    { PJMEDIA_EREMOTENODTMF,	    "Remote does not support DTMF" },
-    { PJMEDIA_RTP_EINDTMF,	    "Invalid DTMF digit" },
-    { PJMEDIA_RTP_EREMNORFC2833,    "Remote does not support RFC 2833" },
+    PJ_BUILD_ERR( PJMEDIA_EINVALIDIP,	    "Invalid remote media (IP) address" ),
+    PJ_BUILD_ERR( PJMEDIA_EASYMCODEC,	    "Asymetric media codec is not supported" ),
+    PJ_BUILD_ERR( PJMEDIA_EINVALIDPT,	    "Invalid media payload type" ),
+    PJ_BUILD_ERR( PJMEDIA_EMISSINGRTPMAP,   "Missing rtpmap in media description" ),
+    PJ_BUILD_ERR( PJMEDIA_EINVALIMEDIATYPE, "Invalid media type" ),
+    PJ_BUILD_ERR( PJMEDIA_EREMOTENODTMF,    "Remote does not support DTMF" ),
+    PJ_BUILD_ERR( PJMEDIA_RTP_EINDTMF,	    "Invalid DTMF digit" ),
+    PJ_BUILD_ERR( PJMEDIA_RTP_EREMNORFC2833,"Remote does not support RFC 2833" ),
 
     /* RTP session errors. */
-    { PJMEDIA_RTP_EINPKT,	    "Invalid RTP packet" },
-    { PJMEDIA_RTP_EINPACK,	    "Invalid RTP packing (internal error)" },
-    { PJMEDIA_RTP_EINVER,	    "Invalid RTP version" },
-    { PJMEDIA_RTP_EINSSRC,	    "RTP packet SSRC id mismatch" },
-    { PJMEDIA_RTP_EINPT,	    "RTP packet payload type mismatch" },
-    { PJMEDIA_RTP_EINLEN,	    "Invalid RTP packet length" },
-    { PJMEDIA_RTP_ESESSRESTART,	    "RTP session restarted" },
-    { PJMEDIA_RTP_ESESSPROBATION,   "RTP session in probation" },
-    { PJMEDIA_RTP_EBADSEQ,	    "Bad sequence number in RTP packet" },
-    { PJMEDIA_RTP_EBADDEST,	    "RTP media port destination is not configured" },
-    { PJMEDIA_RTP_ENOCONFIG,	    "RTP is not configured" },
+    PJ_BUILD_ERR( PJMEDIA_RTP_EINPKT,	    "Invalid RTP packet" ),
+    PJ_BUILD_ERR( PJMEDIA_RTP_EINPACK,	    "Invalid RTP packing (internal error)" ),
+    PJ_BUILD_ERR( PJMEDIA_RTP_EINVER,	    "Invalid RTP version" ),
+    PJ_BUILD_ERR( PJMEDIA_RTP_EINSSRC,	    "RTP packet SSRC id mismatch" ),
+    PJ_BUILD_ERR( PJMEDIA_RTP_EINPT,	    "RTP packet payload type mismatch" ),
+    PJ_BUILD_ERR( PJMEDIA_RTP_EINLEN,	    "Invalid RTP packet length" ),
+    PJ_BUILD_ERR( PJMEDIA_RTP_ESESSRESTART,    "RTP session restarted" ),
+    PJ_BUILD_ERR( PJMEDIA_RTP_ESESSPROBATION,  "RTP session in probation" ),
+    PJ_BUILD_ERR( PJMEDIA_RTP_EBADSEQ,	    "Bad sequence number in RTP packet" ),
+    PJ_BUILD_ERR( PJMEDIA_RTP_EBADDEST,	    "RTP media port destination is not configured" ),
+    PJ_BUILD_ERR( PJMEDIA_RTP_ENOCONFIG,    "RTP is not configured" ),
     
     /* Media port errors: */
-    { PJMEDIA_ENOTCOMPATIBLE,	    "Media ports are not compatible" },
-    { PJMEDIA_ENCCLOCKRATE,	    "Media ports have incompatible clock rate" },
-    { PJMEDIA_ENCSAMPLESPFRAME,	    "Media ports have incompatible samples per frame" },
-    { PJMEDIA_ENCTYPE,		    "Media ports have incompatible media type" },
-    { PJMEDIA_ENCBITS,		    "Media ports have incompatible bits per sample" },
-    { PJMEDIA_ENCBYTES,		    "Media ports have incompatible bytes per frame" },
-    { PJMEDIA_ENCCHANNEL,	    "Media ports have incompatible number of channels" },
+    PJ_BUILD_ERR( PJMEDIA_ENOTCOMPATIBLE,   "Media ports are not compatible" ),
+    PJ_BUILD_ERR( PJMEDIA_ENCCLOCKRATE,	    "Media ports have incompatible clock rate" ),
+    PJ_BUILD_ERR( PJMEDIA_ENCSAMPLESPFRAME, "Media ports have incompatible samples per frame" ),
+    PJ_BUILD_ERR( PJMEDIA_ENCTYPE,	    "Media ports have incompatible media type" ),
+    PJ_BUILD_ERR( PJMEDIA_ENCBITS,	    "Media ports have incompatible bits per sample" ),
+    PJ_BUILD_ERR( PJMEDIA_ENCBYTES,	    "Media ports have incompatible bytes per frame" ),
+    PJ_BUILD_ERR( PJMEDIA_ENCCHANNEL,	    "Media ports have incompatible number of channels" ),
 
     /* Media file errors: */
-    { PJMEDIA_ENOTVALIDWAVE,	    "Not a valid WAVE file" },
-    { PJMEDIA_EWAVEUNSUPP,	    "Unsupported WAVE file format" },
-    { PJMEDIA_EWAVETOOSHORT,	    "WAVE file too short" },
-    { PJMEDIA_EFRMFILETOOBIG,	    "Sound frame too large for file buffer"},
+    PJ_BUILD_ERR( PJMEDIA_ENOTVALIDWAVE,    "Not a valid WAVE file" ),
+    PJ_BUILD_ERR( PJMEDIA_EWAVEUNSUPP,	    "Unsupported WAVE file format" ),
+    PJ_BUILD_ERR( PJMEDIA_EWAVETOOSHORT,    "WAVE file too short" ),
+    PJ_BUILD_ERR( PJMEDIA_EFRMFILETOOBIG,   "Sound frame too large for file buffer"),
 
     /* Sound device errors: */
-    { PJMEDIA_ENOSNDREC,	    "No suitable sound capture device" },
-    { PJMEDIA_ENOSNDPLAY,	    "No suitable sound playback device" },
-    { PJMEDIA_ESNDINDEVID,	    "Invalid sound device ID" },
-    { PJMEDIA_ESNDINSAMPLEFMT,	    "Invalid sample format for sound device" },
+    PJ_BUILD_ERR( PJMEDIA_ENOSNDREC,	    "No suitable sound capture device" ),
+    PJ_BUILD_ERR( PJMEDIA_ENOSNDPLAY,	    "No suitable sound playback device" ),
+    PJ_BUILD_ERR( PJMEDIA_ESNDINDEVID,	    "Invalid sound device ID" ),
+    PJ_BUILD_ERR( PJMEDIA_ESNDINSAMPLEFMT,  "Invalid sample format for sound device" ),
 };
 
 #endif	/* PJ_HAS_ERROR_STRING */