diff options
author | Benny Prijono <bennylp@teluu.com> | 2006-07-22 13:42:56 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2006-07-22 13:42:56 +0000 |
commit | ca0e9bd20df27bb62875130a0db513256c92e75a (patch) | |
tree | 76e9d620d2826839286c2b6216c9d2d5df3ad44d /pjsip/include | |
parent | 26e9af9bcbc271bc373dd9f106fd7b143efe7474 (diff) |
Changed all public header files to compile correctly when -ansi and -pedantic is used, also when g++ is used
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@622 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/include')
-rw-r--r-- | pjsip/include/pjsip/sip_auth.h | 4 | ||||
-rw-r--r-- | pjsip/include/pjsip/sip_dialog.h | 6 | ||||
-rw-r--r-- | pjsip/include/pjsip/sip_event.h | 2 | ||||
-rw-r--r-- | pjsip/include/pjsip/sip_module.h | 2 | ||||
-rw-r--r-- | pjsip/include/pjsip/sip_msg.h | 68 | ||||
-rw-r--r-- | pjsip/include/pjsip/sip_parser.h | 4 | ||||
-rw-r--r-- | pjsip/include/pjsip/sip_transaction.h | 2 | ||||
-rw-r--r-- | pjsip/include/pjsip/sip_transport.h | 2 | ||||
-rw-r--r-- | pjsip/include/pjsip/sip_types.h | 9 | ||||
-rw-r--r-- | pjsip/include/pjsip/sip_uri.h | 2 |
10 files changed, 48 insertions, 53 deletions
diff --git a/pjsip/include/pjsip/sip_auth.h b/pjsip/include/pjsip/sip_auth.h index b049e1c4..3028f840 100644 --- a/pjsip/include/pjsip/sip_auth.h +++ b/pjsip/include/pjsip/sip_auth.h @@ -50,7 +50,7 @@ PJ_BEGIN_DECL typedef enum pjsip_cred_data_type { PJSIP_CRED_DATA_PLAIN_PASSWD, /**< Plain text password. */ - PJSIP_CRED_DATA_DIGEST, /**< Hashed digest. */ + PJSIP_CRED_DATA_DIGEST /**< Hashed digest. */ } pjsip_cred_data_type; /** Authentication's quality of protection (qop) type. */ @@ -59,7 +59,7 @@ typedef enum pjsip_auth_qop_type PJSIP_AUTH_QOP_NONE, /**< No quality of protection. */ PJSIP_AUTH_QOP_AUTH, /**< Authentication. */ PJSIP_AUTH_QOP_AUTH_INT, /**< Authentication with integrity protection. */ - PJSIP_AUTH_QOP_UNKNOWN, /**< Unknown protection. */ + PJSIP_AUTH_QOP_UNKNOWN /**< Unknown protection. */ } pjsip_auth_qop_type; diff --git a/pjsip/include/pjsip/sip_dialog.h b/pjsip/include/pjsip/sip_dialog.h index e796b0a3..123209be 100644 --- a/pjsip/include/pjsip/sip_dialog.h +++ b/pjsip/include/pjsip/sip_dialog.h @@ -76,14 +76,14 @@ typedef struct pjsip_dlg_party /** * Dialog state. */ -enum pjsip_dialog_state +typedef enum pjsip_dialog_state { /** Dialog is not established. */ PJSIP_DIALOG_STATE_NULL, /** Dialog has been established (probably early) */ - PJSIP_DIALOG_STATE_ESTABLISHED, -}; + PJSIP_DIALOG_STATE_ESTABLISHED +} pjsip_dialog_state; /** * This structure describes the dialog structure. Application MUST NOT diff --git a/pjsip/include/pjsip/sip_event.h b/pjsip/include/pjsip/sip_event.h index 5dc9d457..3796356f 100644 --- a/pjsip/include/pjsip/sip_event.h +++ b/pjsip/include/pjsip/sip_event.h @@ -59,7 +59,7 @@ typedef enum pjsip_event_id_e PJSIP_EVENT_TSX_STATE, /** Indicates that the event was triggered by user action. */ - PJSIP_EVENT_USER, + PJSIP_EVENT_USER } pjsip_event_id_e; diff --git a/pjsip/include/pjsip/sip_module.h b/pjsip/include/pjsip/sip_module.h index ef13e278..6b340e0c 100644 --- a/pjsip/include/pjsip/sip_module.h +++ b/pjsip/include/pjsip/sip_module.h @@ -207,7 +207,7 @@ enum pjsip_module_priority /** * This is the recommended priority to be used by applications. */ - PJSIP_MOD_PRIORITY_APPLICATION = 64, + PJSIP_MOD_PRIORITY_APPLICATION = 64 }; diff --git a/pjsip/include/pjsip/sip_msg.h b/pjsip/include/pjsip/sip_msg.h index 0f01c06b..af7ad922 100644 --- a/pjsip/include/pjsip/sip_msg.h +++ b/pjsip/include/pjsip/sip_msg.h @@ -37,7 +37,7 @@ PJ_BEGIN_DECL * @{ */ -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * @defgroup PJSIP_MSG_METHOD Methods * @brief Method names and manipulation. @@ -60,7 +60,7 @@ typedef enum pjsip_method_e PJSIP_REGISTER_METHOD, /**< REGISTER method. */ PJSIP_OPTIONS_METHOD, /**< OPTIONS method. */ - PJSIP_OTHER_METHOD, /**< Other method. */ + PJSIP_OTHER_METHOD /**< Other method. */ } pjsip_method_e; @@ -153,7 +153,7 @@ PJ_DECL(int) pjsip_method_cmp( const pjsip_method *m1, const pjsip_method *m2); * @} */ -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * @defgroup PJSIP_MSG_HDR Header Fields * @brief Declarations for various SIP header fields. @@ -218,7 +218,7 @@ typedef enum pjsip_hdr_e PJSIP_H_WARNING_UNIMP, /* N/A, use pjsip_generic_string_hdr */ PJSIP_H_WWW_AUTHENTICATE, - PJSIP_H_OTHER, + PJSIP_H_OTHER } pjsip_hdr_e; @@ -334,7 +334,7 @@ PJ_DECL(int) pjsip_hdr_print_on( void *hdr, char *buf, pj_size_t len); * @} */ -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * @defgroup PJSIP_MSG_LINE Request and Status Line. * @brief Request and status line structures and manipulation. @@ -432,8 +432,8 @@ typedef enum pjsip_status_code PJSIP_SC_NOT_ACCEPTABLE_ANYWHERE = 606, PJSIP_SC_TSX_TIMEOUT = 701, - //PJSIP_SC_TSX_RESOLVE_ERROR = 702, - PJSIP_SC_TSX_TRANSPORT_ERROR = 703, + /*PJSIP_SC_TSX_RESOLVE_ERROR = 702,*/ + PJSIP_SC_TSX_TRANSPORT_ERROR = 703 } pjsip_status_code; @@ -460,7 +460,7 @@ PJ_DECL(const pj_str_t*) pjsip_get_status_text(int status_code); * @} */ -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * @addtogroup PJSIP_MSG_MEDIA Media/MIME Type * @brief Media/MIME type declaration and manipulations. @@ -483,7 +483,7 @@ typedef struct pjsip_media_type * @} */ -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * @addtogroup PJSIP_MSG_BODY Message Body * @brief SIP message body structures and manipulation. @@ -652,7 +652,7 @@ PJ_DECL(pjsip_msg_body*) pjsip_msg_body_create( pj_pool_t *pool, * @} */ -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * @defgroup PJSIP_MSG_MSG Message Structure * @brief SIP message (request and response) structure and operations. @@ -666,7 +666,7 @@ PJ_DECL(pjsip_msg_body*) pjsip_msg_body_create( pj_pool_t *pool, typedef enum pjsip_msg_type_e { PJSIP_REQUEST_MSG, /**< Indicates request message. */ - PJSIP_RESPONSE_MSG, /**< Indicates response message. */ + PJSIP_RESPONSE_MSG /**< Indicates response message. */ } pjsip_msg_type_e; @@ -844,7 +844,7 @@ PJ_DECL(pj_ssize_t) pjsip_msg_print(const pjsip_msg *msg, * @} */ -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * @addtogroup PJSIP_MSG_HDR * @{ @@ -904,7 +904,7 @@ pjsip_generic_string_hdr_init( pj_pool_t *pool, -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * Generic SIP header, which contains hname and a string hvalue. @@ -954,7 +954,7 @@ PJ_DECL(pjsip_generic_int_hdr*) pjsip_generic_int_hdr_init( pj_pool_t *pool, const pj_str_t *hname, int value ); -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** Maximum elements in the header array. */ #define PJSIP_GENERIC_ARRAY_MAX_COUNT 32 @@ -1007,7 +1007,7 @@ PJ_DECL(pjsip_generic_array_hdr*) pjsip_generic_array_hdr_init(pj_pool_t *pool, const pj_str_t *hname); -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** Accept header. */ typedef pjsip_generic_array_hdr pjsip_accept_hdr; @@ -1042,7 +1042,7 @@ PJ_DECL(pjsip_accept_hdr*) pjsip_accept_hdr_init( pj_pool_t *pool, void *mem ); -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * Allow header. @@ -1077,7 +1077,7 @@ PJ_DECL(pjsip_allow_hdr*) pjsip_allow_hdr_create(pj_pool_t *pool); PJ_DECL(pjsip_allow_hdr*) pjsip_allow_hdr_init( pj_pool_t *pool, void *mem ); -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * Call-ID header. @@ -1118,7 +1118,7 @@ PJ_DECL(pjsip_cid_hdr*) pjsip_cid_hdr_init( pj_pool_t *pool, -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * Content-Length header. */ @@ -1154,7 +1154,7 @@ PJ_DECL(pjsip_clen_hdr*) pjsip_clen_hdr_init( pj_pool_t *pool, void *mem ); -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * CSeq header. */ @@ -1190,7 +1190,7 @@ PJ_DECL(pjsip_cseq_hdr*) pjsip_cseq_hdr_create( pj_pool_t *pool ); PJ_DECL(pjsip_cseq_hdr*) pjsip_cseq_hdr_init( pj_pool_t *pool, void *mem ); -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * Contact header. * In this library, contact header only contains single URI. If a message has @@ -1234,7 +1234,7 @@ PJ_DECL(pjsip_contact_hdr*) pjsip_contact_hdr_init( pj_pool_t *pool, void *mem ); -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * Content-Type. */ @@ -1270,7 +1270,7 @@ PJ_DECL(pjsip_ctype_hdr*) pjsip_ctype_hdr_create( pj_pool_t *pool ); PJ_DECL(pjsip_ctype_hdr*) pjsip_ctype_hdr_init( pj_pool_t *pool, void *mem ); -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** Expires header. */ typedef pjsip_generic_int_hdr pjsip_expires_hdr; @@ -1306,7 +1306,7 @@ PJ_DECL(pjsip_expires_hdr*) pjsip_expires_hdr_init( pj_pool_t *pool, -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * To or From header. */ @@ -1391,7 +1391,7 @@ PJ_DECL(pjsip_from_hdr*) pjsip_fromto_hdr_set_from( pjsip_fromto_hdr *hdr ); PJ_DECL(pjsip_to_hdr*) pjsip_fromto_hdr_set_to( pjsip_fromto_hdr *hdr ); -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * Max-Forwards header. */ @@ -1428,7 +1428,7 @@ PJ_DECL(pjsip_max_fwd_hdr*) pjsip_max_fwd_hdr_init( pj_pool_t *pool, void *mem, int value ); -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * Min-Expires header. */ @@ -1466,7 +1466,7 @@ PJ_DECL(pjsip_min_expires_hdr*) pjsip_min_expires_hdr_init( pj_pool_t *pool, int value ); -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * Record-Route and Route headers. */ @@ -1550,7 +1550,7 @@ PJ_DECL(pjsip_rr_hdr*) pjsip_routing_hdr_set_rr( pjsip_routing_hdr *r ); */ PJ_DECL(pjsip_route_hdr*) pjsip_routing_hdr_set_route( pjsip_routing_hdr *r ); -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * Require header. */ @@ -1583,7 +1583,7 @@ PJ_DECL(pjsip_require_hdr*) pjsip_require_hdr_init( pj_pool_t *pool, void *mem ); -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * Retry-After header. */ @@ -1615,7 +1615,7 @@ PJ_DECL(pjsip_retry_after_hdr*) pjsip_retry_after_hdr_init( pj_pool_t *pool, int value ); -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * Supported header. */ @@ -1642,7 +1642,7 @@ PJ_DECL(pjsip_supported_hdr*) pjsip_supported_hdr_create(pj_pool_t *pool); PJ_DECL(pjsip_supported_hdr*) pjsip_supported_hdr_init( pj_pool_t *pool, void *mem ); -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * Unsupported header. */ @@ -1669,7 +1669,7 @@ PJ_DECL(pjsip_unsupported_hdr*) pjsip_unsupported_hdr_create(pj_pool_t *pool); PJ_DECL(pjsip_unsupported_hdr*) pjsip_unsupported_hdr_init( pj_pool_t *pool, void *mem ); -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * SIP Via header. * In this implementation, Via header can only have one element in each header. @@ -1711,7 +1711,7 @@ PJ_DECL(pjsip_via_hdr*) pjsip_via_hdr_create( pj_pool_t *pool ); PJ_DECL(pjsip_via_hdr*) pjsip_via_hdr_init( pj_pool_t *pool, void *mem ); -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** * SIP Warning header. * In this version, Warning header is just a typedef for generic string @@ -1752,7 +1752,7 @@ pjsip_warning_hdr_create_from_status( pj_pool_t *pool, const pj_str_t *host, pj_status_t status); -/////////////////////////////////////////////////////////////////////////////// +/* **************************************************************************/ /** Accept-Encoding header. */ typedef pjsip_generic_string_hdr pjsip_accept_encoding_hdr; @@ -1876,7 +1876,7 @@ typedef pjsip_generic_string_hdr pjsip_user_agent_hdr; */ /** - * @} // PJSIP_MSG + * @} PJSIP_MSG */ diff --git a/pjsip/include/pjsip/sip_parser.h b/pjsip/include/pjsip/sip_parser.h index 452f5f4d..d0eb838e 100644 --- a/pjsip/include/pjsip/sip_parser.h +++ b/pjsip/include/pjsip/sip_parser.h @@ -54,7 +54,7 @@ enum * the URI is not enclosed in brackets ("<" and ">"), all parameters * are treated as header parameters (not URI parameters). */ - PJSIP_PARSE_URI_IN_FROM_TO_HDR = 2, + PJSIP_PARSE_URI_IN_FROM_TO_HDR = 2 }; /** @@ -354,7 +354,7 @@ extern const pj_str_t pjsip_USER_STR, /**< "user" string constant. */ */ enum { - PJSIP_PARSE_REMOVE_QUOTE = 1, + PJSIP_PARSE_REMOVE_QUOTE = 1 }; /* Parse parameter in header (matching the character as token) */ diff --git a/pjsip/include/pjsip/sip_transaction.h b/pjsip/include/pjsip/sip_transaction.h index 1f44e7b6..e15fd13d 100644 --- a/pjsip/include/pjsip/sip_transaction.h +++ b/pjsip/include/pjsip/sip_transaction.h @@ -68,7 +68,7 @@ typedef enum pjsip_tsx_state_e PJSIP_TSX_STATE_CONFIRMED, /**< For UAS, after ACK is received. */ PJSIP_TSX_STATE_TERMINATED, /**< For UAS/UAC, before it's destroyed. */ PJSIP_TSX_STATE_DESTROYED, /**< For UAS/UAC, will be destroyed now. */ - PJSIP_TSX_STATE_MAX, /**< Number of states. */ + PJSIP_TSX_STATE_MAX /**< Number of states. */ } pjsip_tsx_state_e; diff --git a/pjsip/include/pjsip/sip_transport.h b/pjsip/include/pjsip/sip_transport.h index 2f8f679f..69a9f624 100644 --- a/pjsip/include/pjsip/sip_transport.h +++ b/pjsip/include/pjsip/sip_transport.h @@ -62,7 +62,7 @@ enum pjsip_transport_flags_e { PJSIP_TRANSPORT_RELIABLE = 1, /**< Transport is reliable. */ PJSIP_TRANSPORT_SECURE = 2, /**< Transport is secure. */ - PJSIP_TRANSPORT_DATAGRAM = 4, /**< Datagram based transport. + PJSIP_TRANSPORT_DATAGRAM = 4 /**< Datagram based transport. (it's also assumed to be connectionless) */ }; diff --git a/pjsip/include/pjsip/sip_types.h b/pjsip/include/pjsip/sip_types.h index 8ca8a041..d50fdba0 100644 --- a/pjsip/include/pjsip/sip_types.h +++ b/pjsip/include/pjsip/sip_types.h @@ -79,7 +79,7 @@ typedef enum pjsip_transport_type_e PJSIP_TRANSPORT_LOOP, /** Loopback (datagram, unreliable) */ - PJSIP_TRANSPORT_LOOP_DGRAM, + PJSIP_TRANSPORT_LOOP_DGRAM } pjsip_transport_type_e; @@ -162,11 +162,6 @@ typedef pjsip_module pjsip_user_agent; typedef struct pjsip_dialog pjsip_dialog; /** - * Dialog state (sip_dialog.h). - */ -typedef enum pjsip_dialog_state pjsip_dialog_state; - -/** * Transaction role. */ typedef enum pjsip_role_e @@ -177,7 +172,7 @@ typedef enum pjsip_role_e /* Alias: */ PJSIP_UAC_ROLE = PJSIP_ROLE_UAC, /**< Role is UAC. */ - PJSIP_UAS_ROLE = PJSIP_ROLE_UAS, /**< Role is UAS. */ + PJSIP_UAS_ROLE = PJSIP_ROLE_UAS /**< Role is UAS. */ } pjsip_role_e; diff --git a/pjsip/include/pjsip/sip_uri.h b/pjsip/include/pjsip/sip_uri.h index e5981f67..aa0fdf21 100644 --- a/pjsip/include/pjsip/sip_uri.h +++ b/pjsip/include/pjsip/sip_uri.h @@ -144,7 +144,7 @@ typedef enum pjsip_uri_context_e PJSIP_URI_IN_FROMTO_HDR, /**< The URI is in From/To header. */ PJSIP_URI_IN_CONTACT_HDR, /**< The URI is in Contact header. */ PJSIP_URI_IN_ROUTING_HDR, /**< The URI is in Route/Record-Route header. */ - PJSIP_URI_IN_OTHER, /**< Other context (web page, business card, etc.) */ + PJSIP_URI_IN_OTHER /**< Other context (web page, business card, etc.) */ } pjsip_uri_context_e; /** |