1
0
Fork 0

fixed compile warnings

This commit is contained in:
Jan Steemann 2012-11-23 13:18:00 +01:00
parent 973d774ff4
commit bc94851026
7 changed files with 3 additions and 37 deletions

View File

@ -340,7 +340,7 @@ static void SetNameLength (TRI_aql_field_access_t* const fieldAccess) {
fieldAccess->_variableNameLength = strlen(fieldAccess->_fullName); fieldAccess->_variableNameLength = strlen(fieldAccess->_fullName);
} }
else { else {
fieldAccess->_variableNameLength = dotPosition - fieldAccess->_fullName; fieldAccess->_variableNameLength = (size_t) (dotPosition - fieldAccess->_fullName);
} }
} }

View File

@ -179,7 +179,7 @@ char* TRI_GetContextErrorAql (const char* const query, const size_t line, const
// p is pointing at the position in the query the parse error occurred at // p is pointing at the position in the query the parse error occurred at
assert(p >= query); assert(p >= query);
offset = p - query; offset = (size_t) (p - query);
if (strlen(query) < offset + SNIPPET_LENGTH) { if (strlen(query) < offset + SNIPPET_LENGTH) {
return TRI_DuplicateString2Z(TRI_UNKNOWN_MEM_ZONE, query + offset, strlen(query) - offset); return TRI_DuplicateString2Z(TRI_UNKNOWN_MEM_ZONE, query + offset, strlen(query) - offset);

View File

@ -95,9 +95,6 @@ typedef struct {
typedef char GeoIndex; /* to keep the structure private */ typedef char GeoIndex; /* to keep the structure private */
int GeoIndex_assignMethod (void*, TRI_index_method_assignment_type_e);
/////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////
// Allows one or more call back functions to be assigned // Allows one or more call back functions to be assigned
/////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////

View File

@ -560,31 +560,6 @@ struct TRI_index_s* TRI_EnsurePriorityQueueIndexDocumentCollection (TRI_document
/// @} /// @}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// -----------------------------------------------------------------------------
// --SECTION-- PRIORITY QUEUE INDEX
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
// --SECTION-- public functions
// -----------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
/// @addtogroup VocBase
/// @{
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
/// @brief ensures that a cap constraint exists
////////////////////////////////////////////////////////////////////////////////
TRI_index_t* TRI_EnsureCapConstraintDocumentCollection (TRI_document_collection_t*,
size_t,
bool*);
////////////////////////////////////////////////////////////////////////////////
/// @}
////////////////////////////////////////////////////////////////////////////////
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// --SECTION-- SELECT BY EXAMPLE QUERY // --SECTION-- SELECT BY EXAMPLE QUERY
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

View File

@ -54,6 +54,7 @@
#include "MRuby/mr-utils.h" #include "MRuby/mr-utils.h"
#include "Rest/Endpoint.h" #include "Rest/Endpoint.h"
#include "Rest/Initialise.h" #include "Rest/Initialise.h"
#include "Rest/InitialiseRest.h"
#include "SimpleHttpClient/SimpleHttpClient.h" #include "SimpleHttpClient/SimpleHttpClient.h"
#include "SimpleHttpClient/SimpleHttpResult.h" #include "SimpleHttpClient/SimpleHttpResult.h"

View File

@ -304,12 +304,6 @@ char* TRI_UnescapeUtf8String (char const* in, size_t inLength, size_t* outLength
char* TRI_UnescapeUtf8StringZ (TRI_memory_zone_t*, char const* in, size_t inLength, size_t* outLength); char* TRI_UnescapeUtf8StringZ (TRI_memory_zone_t*, char const* in, size_t inLength, size_t* outLength);
////////////////////////////////////////////////////////////////////////////////
/// @brief unescapes unicode escape sequences
////////////////////////////////////////////////////////////////////////////////
char* TRI_UnescapeUtf8StringZ (TRI_memory_zone_t*, char const* in, size_t inLength, size_t* outLength);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @} /// @}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

View File

@ -42,7 +42,6 @@
// --SECTION-- forward declarations // --SECTION-- forward declarations
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void TRI_PrintShape (TRI_shaper_t* shaper, TRI_shape_t const* shape, int indent);
static bool FillShapeValueJson (TRI_shaper_t* shaper, TRI_shape_value_t* dst, TRI_json_t const* json); static bool FillShapeValueJson (TRI_shaper_t* shaper, TRI_shape_value_t* dst, TRI_json_t const* json);
static TRI_json_t* JsonShapeData (TRI_shaper_t* shaper, TRI_shape_t const* shape, char const* data, uint64_t size); static TRI_json_t* JsonShapeData (TRI_shaper_t* shaper, TRI_shape_t const* shape, char const* data, uint64_t size);
static bool StringifyJsonShapeData (TRI_shaper_t* shaper, TRI_string_buffer_t* buffer, TRI_shape_t const* shape, char const* data, uint64_t size); static bool StringifyJsonShapeData (TRI_shaper_t* shaper, TRI_string_buffer_t* buffer, TRI_shape_t const* shape, char const* data, uint64_t size);