Permalink
Browse files

Move cJSON to platform

Change-Id: Icda328c7c450291d5cc139757e422a3a3e817fa6
Reviewed-on: http://review.couchbase.org/34632
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>
  • Loading branch information...
1 parent c12a8a8 commit 5590fff683f5ae57f55728eccb4ce0b8acc42c44 @trondn trondn committed Mar 18, 2014
Showing with 2 additions and 720 deletions.
  1. +2 −13 CMakeLists.txt
  2. +0 −191 include/cJSON.h
  3. +0 −492 src/cJSON.c
  4. +0 −24 tests/cjson_test.c
View
@@ -1,10 +1,10 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include
+ ${CMAKE_CURRENT_SOURCE_DIR}/../platform/include
${CMAKE_CURRENT_SOURCE_DIR})
ADD_LIBRARY(vbucket SHARED
- include/cJSON.h
include/libvbucket/vbucket.h
include/libvbucket/visibility.h
src/crc32.c
@@ -20,16 +20,9 @@ SET_TARGET_PROPERTIES(vbucket PROPERTIES
COMPILE_FLAGS -DBUILDING_LIBVBUCKET=1)
SET_TARGET_PROPERTIES(vbucket PROPERTIES INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib)
-ADD_LIBRARY(cJSON SHARED src/cJSON.c include/cJSON.h)
-SET_TARGET_PROPERTIES(cJSON PROPERTIES SOVERSION 1.0.0)
-SET_TARGET_PROPERTIES(cJSON PROPERTIES COMPILE_FLAGS -DBUILDING_CJSON=1)
-SET_TARGET_PROPERTIES(cJSON PROPERTIES INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib)
-
-
IF (WIN32)
TARGET_LINK_LIBRARIES(vbucket cJSON)
ELSE (WIN32)
- TARGET_LINK_LIBRARIES(cJSON m)
TARGET_LINK_LIBRARIES(vbucket cJSON m)
ENDIF (WIN32)
@@ -38,10 +31,9 @@ IF (INSTALL_HEADER_FILES)
include/libvbucket/vbucket.h
include/libvbucket/visibility.h
DESTINATION include/libvbucket)
- INSTALL(FILES include/cJSON.h DESTINATION include)
ENDIF(INSTALL_HEADER_FILES)
-INSTALL(TARGETS vbucket cJSON
+INSTALL(TARGETS vbucket
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
@@ -61,8 +53,6 @@ TARGET_LINK_LIBRARIES(vbucketkeygen vbucket)
#
# The tests. These are automatically executed as part of the build!
#
-ADD_EXECUTABLE(libvbucket_cjson_test include/cJSON.h tests/cjson_test.c)
-TARGET_LINK_LIBRARIES(libvbucket_cjson_test cJSON)
ADD_EXECUTABLE(libvbucket_testapp
include/libvbucket/vbucket.h
@@ -85,7 +75,6 @@ ADD_EXECUTABLE(libvbucket_testketama
tests/testketama.c)
TARGET_LINK_LIBRARIES(libvbucket_testketama vbucket)
-ADD_TEST(libvbucket-cjson-test libvbucket_cjson_test)
ADD_TEST(libvbucket-basic-tests libvbucket_testapp ${CMAKE_CURRENT_SOURCE_DIR})
ADD_TEST(libvbucket-regression-tests libvbucket_regression ${CMAKE_CURRENT_SOURCE_DIR})
ADD_TEST(libvbucket-ketama-tests libvbucket_testketama)
View
@@ -1,191 +0,0 @@
-/*
- Copyright (c) 2009 Dave Gamble
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-*/
-
-#ifndef cJSON__h
-#define cJSON__h
-
-#ifdef BUILDING_CJSON
-
-#if defined (__SUNPRO_C) && (__SUNPRO_C >= 0x550)
-#define CJSON_PUBLIC_API __global
-#elif defined __GNUC__
-#define CJSON_PUBLIC_API __attribute__ ((visibility("default")))
-#elif defined(_MSC_VER)
-#define CJSON_PUBLIC_API __declspec(dllexport)
-#else
-/* unknown compiler */
-#define CJSON_PUBLIC_API
-#endif
-
-#else
-
-#if defined(_MSC_VER)
-#define CJSON_PUBLIC_API __declspec(dllimport)
-#else
-#define CJSON_PUBLIC_API
-#endif
-
-#endif
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/* cJSON Types: */
-#define cJSON_False 0
-#define cJSON_True 1
-#define cJSON_NULL 2
-#define cJSON_Number 3
-#define cJSON_String 4
-#define cJSON_Array 5
-#define cJSON_Object 6
-
-#define cJSON_IsReference 256
-
-/* The cJSON structure: */
-typedef struct cJSON {
- struct cJSON *next,*prev; /* next/prev allow you to walk
- array/object
- chains. Alternatively, use
- GetArraySize/GetArrayItem/GetObjectItem */
- struct cJSON *child; /* An array or object item will have a
- child pointer pointing to a chain of
- the items in the array/object. */
-
- int type; /* The type of the item, as above. */
-
- char *valuestring; /* The item's string, if type==cJSON_String */
- int valueint; /* The item's number, if type==cJSON_Number */
- double valuedouble; /* The item's number, if type==cJSON_Number */
-
- char *string; /* The item's name string, if this item is the
- child of, or is in the list of subitems of an
- object. */
-} cJSON;
-
-typedef struct cJSON_Hooks {
- void *(*malloc_fn)(size_t sz);
- void (*free_fn)(void *ptr);
-} cJSON_Hooks;
-
-/* Supply malloc, realloc and free functions to cJSON */
-CJSON_PUBLIC_API
-extern void cJSON_InitHooks(cJSON_Hooks* hooks);
-
-
-/* Supply a block of JSON, and this returns a cJSON object you can
- interrogate. Call cJSON_Delete when finished. */
-CJSON_PUBLIC_API
-extern cJSON *cJSON_Parse(const char *value);
-/* Render a cJSON entity to text for transfer/storage. Free the char*
- when finished. */
-CJSON_PUBLIC_API
-extern char *cJSON_Print(cJSON *item);
-/* Render a cJSON entity to text for transfer/storage without any
- formatting. Free the char* when finished. */
-CJSON_PUBLIC_API
-extern char *cJSON_PrintUnformatted(cJSON *item);
-/* Release the memory returned by cJSON_Print and cJSON_PrintUnformatted */
-CJSON_PUBLIC_API
-extern void cJSON_Free(char *ptr);
-/* Delete a cJSON entity and all subentities. */
-CJSON_PUBLIC_API
-extern void cJSON_Delete(cJSON *c);
-
-/* Returns the number of items in an array (or object). */
-CJSON_PUBLIC_API
-extern int cJSON_GetArraySize(cJSON *array);
-/* Retrieve item number "item" from array "array". Returns NULL if
- unsuccessful. */
-CJSON_PUBLIC_API
-extern cJSON *cJSON_GetArrayItem(cJSON *array,int item);
-/* Get item "string" from object. Case insensitive. */
-CJSON_PUBLIC_API
-extern cJSON *cJSON_GetObjectItem(cJSON *object,const char *string);
-
-/* These calls create a cJSON item of the appropriate type. */
-CJSON_PUBLIC_API
-extern cJSON *cJSON_CreateNull(void);
-CJSON_PUBLIC_API
-extern cJSON *cJSON_CreateTrue(void);
-CJSON_PUBLIC_API
-extern cJSON *cJSON_CreateFalse(void);
-CJSON_PUBLIC_API
-extern cJSON *cJSON_CreateNumber(double num);
-CJSON_PUBLIC_API
-extern cJSON *cJSON_CreateString(const char *string);
-CJSON_PUBLIC_API
-extern cJSON *cJSON_CreateArray(void);
-CJSON_PUBLIC_API
-extern cJSON *cJSON_CreateObject(void);
-
-/* These utilities create an Array of count items. */
-CJSON_PUBLIC_API
-extern cJSON *cJSON_CreateIntArray(int *numbers,int count);
-CJSON_PUBLIC_API
-extern cJSON *cJSON_CreateFloatArray(float *numbers,int count);
-CJSON_PUBLIC_API
-extern cJSON *cJSON_CreateDoubleArray(double *numbers,int count);
-CJSON_PUBLIC_API
-extern cJSON *cJSON_CreateStringArray(const char **strings,int count);
-
-/* Append item to the specified array/object. */
-CJSON_PUBLIC_API
-extern void cJSON_AddItemToArray(cJSON *array, cJSON *item);
-CJSON_PUBLIC_API
-extern void cJSON_AddItemToObject(cJSON *object,const char *string,cJSON *item);
-/* Append reference to item to the specified array/object. Use this
- when you want to add an existing cJSON to a new cJSON, but don't
- want to corrupt your existing cJSON. */
-CJSON_PUBLIC_API
-extern void cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
-CJSON_PUBLIC_API
-extern void cJSON_AddItemReferenceToObject(cJSON *object,const char *string,cJSON *item);
-
-/* Remove/Detatch items from Arrays/Objects. */
-CJSON_PUBLIC_API
-extern cJSON *cJSON_DetachItemFromArray(cJSON *array,int which);
-CJSON_PUBLIC_API
-extern void cJSON_DeleteItemFromArray(cJSON *array,int which);
-CJSON_PUBLIC_API
-extern cJSON *cJSON_DetachItemFromObject(cJSON *object,const char *string);
-CJSON_PUBLIC_API
-extern void cJSON_DeleteItemFromObject(cJSON *object,const char *string);
-
-/* Update array items. */
-CJSON_PUBLIC_API
-extern void cJSON_ReplaceItemInArray(cJSON *array,int which,cJSON *newitem);
-CJSON_PUBLIC_API
-extern void cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
-
-#define cJSON_AddNullToObject(object,name) cJSON_AddItemToObject(object, name, cJSON_CreateNull())
-#define cJSON_AddTrueToObject(object,name) cJSON_AddItemToObject(object, name, cJSON_CreateTrue())
-#define cJSON_AddFalseToObject(object,name) cJSON_AddItemToObject(object, name, cJSON_CreateFalse())
-#define cJSON_AddNumberToObject(object,name,n) cJSON_AddItemToObject(object, name, cJSON_CreateNumber(n))
-#define cJSON_AddStringToObject(object,name,s) cJSON_AddItemToObject(object, name, cJSON_CreateString(s))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
Oops, something went wrong.

0 comments on commit 5590fff

Please sign in to comment.