Remove the "xboolean" typedef from the code base.
(cherry picked from commit 6e7a2bb2dc02f20250d13c1b21d74c4fcce1b1f5)
This commit is contained in:
parent
9e7e7e3b89
commit
1316c82d04
@ -90,7 +90,7 @@ genaCallback( IN http_parser_t * parser,
|
|||||||
IN http_message_t * request,
|
IN http_message_t * request,
|
||||||
INOUT SOCKINFO * info )
|
INOUT SOCKINFO * info )
|
||||||
{
|
{
|
||||||
xboolean found_function = FALSE;
|
int found_function = FALSE;
|
||||||
|
|
||||||
if( request->method == HTTPMETHOD_SUBSCRIBE ) {
|
if( request->method == HTTPMETHOD_SUBSCRIBE ) {
|
||||||
#ifdef INCLUDE_DEVICE_APIS
|
#ifdef INCLUDE_DEVICE_APIS
|
||||||
|
@ -44,7 +44,7 @@
|
|||||||
#include "statcodes.h"
|
#include "statcodes.h"
|
||||||
#include "parsetools.h"
|
#include "parsetools.h"
|
||||||
|
|
||||||
xboolean has_xml_content_type(http_message_t *hmsg)
|
int has_xml_content_type(http_message_t *hmsg)
|
||||||
{
|
{
|
||||||
memptr hdr_value;
|
memptr hdr_value;
|
||||||
|
|
||||||
|
@ -96,7 +96,7 @@ static const char *Http5xxStr =
|
|||||||
"Service Unavailable\0"
|
"Service Unavailable\0"
|
||||||
"Gateway Timeout\0" "HTTP Version Not Supported\0";
|
"Gateway Timeout\0" "HTTP Version Not Supported\0";
|
||||||
|
|
||||||
static xboolean gInitialized = FALSE;
|
static int gInitialized = FALSE;
|
||||||
|
|
||||||
/************************************************************************
|
/************************************************************************
|
||||||
************************* Functions *************************************
|
************************* Functions *************************************
|
||||||
|
@ -48,7 +48,7 @@
|
|||||||
* matched.
|
* matched.
|
||||||
* IN int num_entries ; number of entries in the table that need
|
* IN int num_entries ; number of entries in the table that need
|
||||||
* to be searched.
|
* to be searched.
|
||||||
* IN xboolean case_sensitive ; whether the case should be case
|
* IN int case_sensitive ; whether the case should be case
|
||||||
* sensitive or not
|
* sensitive or not
|
||||||
*
|
*
|
||||||
* Description : Match the given name with names from the entries in the
|
* Description : Match the given name with names from the entries in the
|
||||||
@ -65,7 +65,7 @@ map_str_to_int( IN const char *name,
|
|||||||
IN size_t name_len,
|
IN size_t name_len,
|
||||||
IN str_int_entry * table,
|
IN str_int_entry * table,
|
||||||
IN int num_entries,
|
IN int num_entries,
|
||||||
IN xboolean case_sensitive )
|
IN int case_sensitive )
|
||||||
{
|
{
|
||||||
int top,
|
int top,
|
||||||
mid,
|
mid,
|
||||||
|
@ -64,7 +64,7 @@ typedef struct
|
|||||||
size_t cursor;
|
size_t cursor;
|
||||||
/*! set this to TRUE if the entire msg is loaded in 'msg';
|
/*! set this to TRUE if the entire msg is loaded in 'msg';
|
||||||
* else FALSE if only partial msg in 'msg' (default is FALSE). */
|
* else FALSE if only partial msg in 'msg' (default is FALSE). */
|
||||||
xboolean entire_msg_loaded;
|
int entire_msg_loaded;
|
||||||
} scanner_t;
|
} scanner_t;
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
@ -185,7 +185,7 @@ typedef struct {
|
|||||||
membuffer status_msg;
|
membuffer status_msg;
|
||||||
/* fields used in both request or response messages. */
|
/* fields used in both request or response messages. */
|
||||||
/*! if TRUE, msg is a request, else response. */
|
/*! if TRUE, msg is a request, else response. */
|
||||||
xboolean is_request;
|
int is_request;
|
||||||
/* http major version. */
|
/* http major version. */
|
||||||
int major_version;
|
int major_version;
|
||||||
/* http minor version. */
|
/* http minor version. */
|
||||||
@ -210,7 +210,7 @@ typedef struct {
|
|||||||
int http_error_code;
|
int http_error_code;
|
||||||
/*! read-only; this is set to true if a NOTIFY request has no
|
/*! read-only; this is set to true if a NOTIFY request has no
|
||||||
* content-length. used to read valid sspd notify msg. */
|
* content-length. used to read valid sspd notify msg. */
|
||||||
xboolean valid_ssdp_notify_hack;
|
int valid_ssdp_notify_hack;
|
||||||
/* private data -- don't touch. */
|
/* private data -- don't touch. */
|
||||||
parser_pos_t position;
|
parser_pos_t position;
|
||||||
int ent_position;
|
int ent_position;
|
||||||
|
@ -49,7 +49,7 @@ extern "C" {
|
|||||||
*
|
*
|
||||||
* \return boolean.
|
* \return boolean.
|
||||||
*/
|
*/
|
||||||
xboolean has_xml_content_type(
|
int has_xml_content_type(
|
||||||
/*! HTTP Message object. */
|
/*! HTTP Message object. */
|
||||||
IN http_message_t *hmsg);
|
IN http_message_t *hmsg);
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ extern "C" {
|
|||||||
* matched.
|
* matched.
|
||||||
* IN int num_entries ; number of entries in the table that need
|
* IN int num_entries ; number of entries in the table that need
|
||||||
* to be searched.
|
* to be searched.
|
||||||
* IN xboolean case_sensitive ; whether the case should be case
|
* IN int case_sensitive ; whether the case should be case
|
||||||
* sensitive or not
|
* sensitive or not
|
||||||
*
|
*
|
||||||
* Description : Match the given name with names from the entries in the
|
* Description : Match the given name with names from the entries in the
|
||||||
@ -71,7 +71,7 @@ extern "C" {
|
|||||||
************************************************************************/
|
************************************************************************/
|
||||||
int map_str_to_int( IN const char* name, IN size_t name_len,
|
int map_str_to_int( IN const char* name, IN size_t name_len,
|
||||||
IN str_int_entry* table, IN int num_entries,
|
IN str_int_entry* table, IN int num_entries,
|
||||||
IN xboolean case_sensitive );
|
IN int case_sensitive );
|
||||||
|
|
||||||
|
|
||||||
/************************************************************************
|
/************************************************************************
|
||||||
|
@ -56,14 +56,10 @@
|
|||||||
#define EVENT_TIMEDOUT -2
|
#define EVENT_TIMEDOUT -2
|
||||||
#define EVENT_TERMINATE -3
|
#define EVENT_TERMINATE -3
|
||||||
|
|
||||||
|
|
||||||
/*! boolean type in C. */
|
/*! boolean type in C. */
|
||||||
typedef char xboolean;
|
|
||||||
|
|
||||||
#ifndef TRUE
|
#ifndef TRUE
|
||||||
#define TRUE 1
|
#define TRUE 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef FALSE
|
#ifndef FALSE
|
||||||
#define FALSE 0
|
#define FALSE 0
|
||||||
#endif
|
#endif
|
||||||
|
@ -628,10 +628,10 @@ static void free_ssdp_event_handler_data(void *the_data)
|
|||||||
* Description:
|
* Description:
|
||||||
* This function do some quick checking of the ssdp msg
|
* This function do some quick checking of the ssdp msg
|
||||||
*
|
*
|
||||||
* Returns: xboolean
|
* Returns: int
|
||||||
* returns TRUE if msg is valid else FALSE
|
* returns TRUE if msg is valid else FALSE
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
static UPNP_INLINE xboolean valid_ssdp_msg(IN http_message_t *hmsg)
|
static UPNP_INLINE int valid_ssdp_msg(IN http_message_t *hmsg)
|
||||||
{
|
{
|
||||||
memptr hdr_value;
|
memptr hdr_value;
|
||||||
|
|
||||||
|
@ -214,7 +214,7 @@ static int config_description_doc(
|
|||||||
IN const char *ip_str,
|
IN const char *ip_str,
|
||||||
OUT char **root_path_str )
|
OUT char **root_path_str )
|
||||||
{
|
{
|
||||||
xboolean addNew = FALSE;
|
int addNew = FALSE;
|
||||||
IXML_NodeList *baseList;
|
IXML_NodeList *baseList;
|
||||||
IXML_Element *element = NULL;
|
IXML_Element *element = NULL;
|
||||||
IXML_Element *newElement = NULL;
|
IXML_Element *newElement = NULL;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user