mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-30 02:19:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix line terminators to be UNIX.

Browse Source
This commit is contained in:
Björn Esser
2020-04-10 13:25:41 +02:00
parent 270dc2f999
commit 37355cf0e6
4 changed files with 429 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

307
.travis.yml
View File

@@ -1,154 +1,153 @@
language: cpp language: cpp
matrix: matrix:
include: include:
# gcc # gcc
# xenial # xenial
# gcc 5 is the default on xenial # gcc 5 is the default on xenial
- os: linux - os: linux
dist: xenial dist: xenial
compiler: gcc compiler: gcc
addons: addons:
apt: apt:
packages: packages:
- valgrind - valgrind
- cppcheck - cppcheck
- doxygen - doxygen
- cmake - cmake
env: CHECK="true" env: CHECK="true"
# bionic # bionic
- os: linux - os: linux
dist: bionic dist: bionic
compiler: gcc compiler: gcc
env: MATRIX_EVAL="CC=gcc-6 && CXX=g++-6" env: MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
# gcc 7 is the default on bionic # gcc 7 is the default on bionic
- os: linux - os: linux
dist: bionic dist: bionic
compiler: gcc compiler: gcc
env: CHECK="true" env: CHECK="true"
- os: linux - os: linux
dist: bionic dist: bionic
compiler: gcc compiler: gcc
env: MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" env: MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
# clang # clang
# xenial # xenial
- os: linux - os: linux
dist: xenial dist: xenial
compiler: clang compiler: clang
addons: addons:
apt: apt:
sources: sources:
- llvm-toolchain-xenial-5.0 - llvm-toolchain-xenial-5.0
packages: packages:
- clang-5.0 - clang-5.0
- cmake - cmake
env: MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0" env: MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
- os: linux - os: linux
dist: xenial dist: xenial
compiler: clang compiler: clang
addons: addons:
apt: apt:
sources: sources:
- llvm-toolchain-xenial-6.0 - llvm-toolchain-xenial-6.0
packages: packages:
- clang-6.0 - clang-6.0
- cmake - cmake
env: MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0" env: MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0"
# clang-7 is the default on xenial and bionic # clang-7 is the default on xenial and bionic
- os: linux - os: linux
dist: xenial dist: xenial
compiler: clang compiler: clang
addons: addons:
apt: apt:
packages: packages:
- valgrind - valgrind
- cppcheck - cppcheck
- doxygen - doxygen
- cmake - cmake
env: CHECK="true" env: CHECK="true"
# bionic # bionic
- os: linux - os: linux
dist: bionic dist: bionic
compiler: clang compiler: clang
env: CHECK="true" env: CHECK="true"
# osx # osx
- os: osx - os: osx
osx_image: xcode9.4 osx_image: xcode9.4
env: XCODE="true" env: XCODE="true"
- os: osx - os: osx
osx_image: xcode10.1 osx_image: xcode10.1
env: XCODE="true" CHECK="true" env: XCODE="true" CHECK="true"
# run coveralls # run coveralls
- os: linux - os: linux
dist: xenial dist: xenial
compiler: gcc compiler: gcc
addons: addons:
apt: apt:
packages: packages:
- lcov - lcov
env: CHECK="true" env: CHECK="true"
before_install: before_install:
- sudo gem install coveralls-lcov - sudo gem install coveralls-lcov
- echo $CC - echo $CC
- echo $LANG - echo $LANG
- echo $LC_ALL - echo $LC_ALL
- set -e - set -e
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
eval "${MATRIX_EVAL}"; eval "${MATRIX_EVAL}";
if [ -n "$MATRIX_EVAL" ] && [ "$TRAVIS_COMPILER" != "clang" ]; then if [ -n "$MATRIX_EVAL" ] && [ "$TRAVIS_COMPILER" != "clang" ]; then
sudo apt-get install -y $CC; sudo apt-get install -y $CC;
fi; fi;
fi fi
before_script: before_script:
- export CFLAGS="-fprofile-arcs -ftest-coverage" - export CFLAGS="-fprofile-arcs -ftest-coverage"
- mkdir build && cd build && cmake .. - mkdir build && cd build && cmake ..
script: script:
- make - make
- make test - make test
after_success: after_success:
- cd .. - cd ..
- lcov -d build/ -b . -c -o build/all_coverage.info - lcov -d build/ -b . -c -o build/all_coverage.info
- lcov -r build/all_coverage.info '/usr/*' '*CMakeFiles*' '*fuzz*' '*test*' -o build/coverage.info - lcov -r build/all_coverage.info '/usr/*' '*CMakeFiles*' '*fuzz*' '*test*' -o build/coverage.info
- coveralls-lcov --verbose build/coverage.info - coveralls-lcov --verbose build/coverage.info
# allow_failures: # allow_failures:
# - os: osx # - os: osx
before_install: before_install:
- echo $CC - echo $CC
- echo $LANG - echo $LANG
- echo $LC_ALL - echo $LC_ALL
- set -e - set -e
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
eval "${MATRIX_EVAL}"; eval "${MATRIX_EVAL}";
if [ -n "$MATRIX_EVAL" ] && [ "$TRAVIS_COMPILER" != "clang" ]; then if [ -n "$MATRIX_EVAL" ] && [ "$TRAVIS_COMPILER" != "clang" ]; then
sudo apt-get install -y $CC; sudo apt-get install -y $CC;
fi; fi;
fi fi
before_script: before_script:
# XXX osx on travis doesn't work w/ set -e, so turn it off :( # XXX osx on travis doesn't work w/ set -e, so turn it off :(
- set +e - set +e
- mkdir -p build || echo "Failed to mkdir build" - mkdir -p build || echo "Failed to mkdir build"
- cd build || echo "Failed to cd build" - cd build || echo "Failed to cd build"
- cmake .. || echo "Failed to run cmake" - cmake .. || echo "Failed to run cmake"
script: script:
- make - make
# when using bionic, Travis seems to ignore the "addons" section, so installing the packages with apt-get... # when using bionic, Travis seems to ignore the "addons" section, so installing the packages with apt-get...
- if [ -n "$CHECK" ]; then - if [ -n "$CHECK" ]; then
if [ "$TRAVIS_OS_NAME" = "osx" ]; then if [ "$TRAVIS_OS_NAME" = "osx" ]; then
brew install doxygen; brew install doxygen;
else else
if [ "$TRAVIS_DIST" = "bionic" ]; then if [ "$TRAVIS_DIST" = "bionic" ]; then
sudo apt-get install -y valgrind cppcheck doxygen; sudo apt-get install -y valgrind cppcheck doxygen;
fi; fi;
fi; fi;
make distcheck; make distcheck;
if type cppcheck &> /dev/null ; then cppcheck --error-exitcode=1 --quiet *.h *.c tests/ ; fi; if type cppcheck &> /dev/null ; then cppcheck --error-exitcode=1 --quiet *.h *.c tests/ ; fi;
fi fi

64
STYLE.txt
View File

@@ -1,32 +1,32 @@
In general: In general:
For minor changes to a function, copy the existing formatting. For minor changes to a function, copy the existing formatting.
When changing the style, commit that separately from other changes. When changing the style, commit that separately from other changes.
For new code and major changes to a function, switch to the official json-c style. For new code and major changes to a function, switch to the official json-c style.
Official json-c style: Official json-c style:
Aim for readability, not strict conformance to fixed style rules. Aim for readability, not strict conformance to fixed style rules.
Formatting is tab based; previous attempts at proper alignment with Formatting is tab based; previous attempts at proper alignment with
spaces for continuation lines have been abandoned in favor of the spaces for continuation lines have been abandoned in favor of the
convenience of using clang-format. convenience of using clang-format.
Refer to the .clang-format file for details, and run the tool before commit: Refer to the .clang-format file for details, and run the tool before commit:
clang-format -i somefile.c foo.h clang-format -i somefile.c foo.h
For sections of code that would be significantly negatively impacted, surround For sections of code that would be significantly negatively impacted, surround
them with magic comments to disable formatting: them with magic comments to disable formatting:
/* clang-format off */ /* clang-format off */
...code... ...code...
/* clang-format on */ /* clang-format on */
Naming: Naming:
Words within function and variable names are separated with underscores. Avoid camel case. Words within function and variable names are separated with underscores. Avoid camel case.
Prefer longer, more descriptive names, but not excessively so. No single letter variable names. Prefer longer, more descriptive names, but not excessively so. No single letter variable names.
Other: Other:
Variables should be defined for the smallest scope needed. Variables should be defined for the smallest scope needed.
Functions should be defined static when possible. Functions should be defined static when possible.
When possible, avoid exposing internals in the public API. When possible, avoid exposing internals in the public API.

74
appveyor.yml
View File

@@ -1,37 +1,37 @@
version: '{branch}.{build}' version: '{branch}.{build}'
os: Windows Server 2012 R2 os: Windows Server 2012 R2
platform: x64 platform: x64
# There should be a better way to set-up a build matrix. # There should be a better way to set-up a build matrix.
environment: environment:
matrix: matrix:
- b_toolset: Windows7.1SDK - b_toolset: Windows7.1SDK
b_config: Debug b_config: Debug
- b_toolset: Windows7.1SDK - b_toolset: Windows7.1SDK
b_config: Release b_config: Release
- b_toolset: v120 - b_toolset: v120
b_config: Debug b_config: Debug
- b_toolset: v120 - b_toolset: v120
b_config: Release b_config: Release
- b_toolset: v140 - b_toolset: v140
b_config: Debug b_config: Debug
- b_toolset: v140 - b_toolset: v140
b_config: Release b_config: Release
build_script: build_script:
- cmake -T %b_toolset% -DCMAKE_BUILD_TYPE=%b_config% -DCMAKE_INSTALL_PREFIX=t_install . - cmake -T %b_toolset% -DCMAKE_BUILD_TYPE=%b_config% -DCMAKE_INSTALL_PREFIX=t_install .
- cmake --build . --target install - cmake --build . --target install
after_build: after_build:
- cd t_install - cd t_install
- 7z a ../json-c.win32.%b_toolset%.%b_config%.zip * - 7z a ../json-c.win32.%b_toolset%.%b_config%.zip *
artifacts: artifacts:
- path: json-c.win32.%b_toolset%.%b_config%.zip - path: json-c.win32.%b_toolset%.%b_config%.zip
name: json-c.win32.%b_toolset%.%b_config%.zip name: json-c.win32.%b_toolset%.%b_config%.zip

414
config.h.win32
View File

@@ -1,207 +1,207 @@
/* config.h.in. Generated from configure.ac by autoheader. */ /* config.h.in. Generated from configure.ac by autoheader. */
/* Enable RDRANR Hardware RNG Hash Seed */ /* Enable RDRANR Hardware RNG Hash Seed */
#undef ENABLE_RDRAND #undef ENABLE_RDRAND
/* Define if .gnu.warning accepts long strings. */ /* Define if .gnu.warning accepts long strings. */
#undef HAS_GNU_WARNING_LONG #undef HAS_GNU_WARNING_LONG
/* Define to 1 if you have the declaration of `INFINITY', and to 0 if you /* Define to 1 if you have the declaration of `INFINITY', and to 0 if you
don't. */ don't. */
#if (defined(_MSC_VER) && _MSC_VER >= 1800) || defined(__MINGW32__) #if (defined(_MSC_VER) && _MSC_VER >= 1800) || defined(__MINGW32__)
#define HAVE_DECL_INFINITY 1 #define HAVE_DECL_INFINITY 1
#endif #endif
/* Define to 1 if you have the declaration of `isinf', and to 0 if you don't. /* Define to 1 if you have the declaration of `isinf', and to 0 if you don't.
*/ */
#if (defined(_MSC_VER) && _MSC_VER >= 1800) || defined(__MINGW32__) #if (defined(_MSC_VER) && _MSC_VER >= 1800) || defined(__MINGW32__)
#define HAVE_DECL_ISINF 1 #define HAVE_DECL_ISINF 1
#endif #endif
/* Define to 1 if you have the declaration of `isnan', and to 0 if you don't. /* Define to 1 if you have the declaration of `isnan', and to 0 if you don't.
*/ */
#if (defined(_MSC_VER) && _MSC_VER >= 1800) || defined(__MINGW32__) #if (defined(_MSC_VER) && _MSC_VER >= 1800) || defined(__MINGW32__)
#define HAVE_DECL_ISNAN 1 #define HAVE_DECL_ISNAN 1
#endif #endif
/* Define to 1 if you have the declaration of `nan', and to 0 if you don't. */ /* Define to 1 if you have the declaration of `nan', and to 0 if you don't. */
#if (defined(_MSC_VER) && _MSC_VER >= 1800) || defined(__MINGW32__) #if (defined(_MSC_VER) && _MSC_VER >= 1800) || defined(__MINGW32__)
#define HAVE_DECL_NAN 1 #define HAVE_DECL_NAN 1
#endif #endif
/* Define to 1 if you have the declaration of `_finite', and to 0 if you /* Define to 1 if you have the declaration of `_finite', and to 0 if you
don't. */ don't. */
#define HAVE_DECL__FINITE 1 #define HAVE_DECL__FINITE 1
/* Define to 1 if you have the declaration of `_isnan', and to 0 if you don't. /* Define to 1 if you have the declaration of `_isnan', and to 0 if you don't.
*/ */
#define HAVE_DECL__ISNAN 1 #define HAVE_DECL__ISNAN 1
/* Define to 1 if you have the <dlfcn.h> header file. */ /* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1 #define HAVE_DLFCN_H 1
/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
#define HAVE_DOPRNT 1 #define HAVE_DOPRNT 1
/* Define to 1 if you have the <endian.h> header file. */ /* Define to 1 if you have the <endian.h> header file. */
#undef HAVE_ENDIAN_H #undef HAVE_ENDIAN_H
/* Define to 1 if you have the <fcntl.h> header file. */ /* Define to 1 if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H 1 #define HAVE_FCNTL_H 1
/* Define to 1 if you have the <inttypes.h> header file. */ /* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1 #define HAVE_INTTYPES_H 1
/* Define to 1 if you have the <limits.h> header file. */ /* Define to 1 if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1 #define HAVE_LIMITS_H 1
/* Define to 1 if you have the <locale.h> header file. */ /* Define to 1 if you have the <locale.h> header file. */
#define HAVE_LOCALE_H 1 #define HAVE_LOCALE_H 1
/* Define to 1 if your system has a GNU libc compatible `malloc' function, and /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
to 0 otherwise. */ to 0 otherwise. */
#define HAVE_MALLOC 1 #define HAVE_MALLOC 1
/* Define to 1 if you have the <memory.h> header file. */ /* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1 #define HAVE_MEMORY_H 1
/* Define to 1 if you have the `open' function. */ /* Define to 1 if you have the `open' function. */
#define HAVE_OPEN 1 #define HAVE_OPEN 1
/* Define to 1 if your system has a GNU libc compatible `realloc' function, /* Define to 1 if your system has a GNU libc compatible `realloc' function,
and to 0 otherwise. */ and to 0 otherwise. */
#define HAVE_REALLOC 1 #define HAVE_REALLOC 1
/* Define to 1 if you have the `setlocale' function. */ /* Define to 1 if you have the `setlocale' function. */
#define HAVE_SETLOCALE 1 #define HAVE_SETLOCALE 1
/* Define to 1 if you have the `snprintf' function. */ /* Define to 1 if you have the `snprintf' function. */
#if defined(__MINGW32__) #if defined(__MINGW32__)
#define HAVE_SNPRINTF 1 #define HAVE_SNPRINTF 1
#else #else
#undef HAVE_SNPRINTF #undef HAVE_SNPRINTF
#endif #endif
/* Define to 1 if you have the <stdarg.h> header file. */ /* Define to 1 if you have the <stdarg.h> header file. */
#define HAVE_STDARG_H 1 #define HAVE_STDARG_H 1
/* Define to 1 if you have the <stdint.h> header file. */ /* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1 #define HAVE_STDINT_H 1
/* Define to 1 if you have the <stdlib.h> header file. */ /* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1 #define HAVE_STDLIB_H 1
/* Define to 1 if you have the `strcasecmp' function. */ /* Define to 1 if you have the `strcasecmp' function. */
#define HAVE_STRCASECMP 1 #define HAVE_STRCASECMP 1
/* Define to 1 if you have the `strdup' function. */ /* Define to 1 if you have the `strdup' function. */
#define HAVE_STRDUP 0 #define HAVE_STRDUP 0
/* Define to 1 if you have the `strerror' function. */ /* Define to 1 if you have the `strerror' function. */
#define HAVE_STRERROR 1 #define HAVE_STRERROR 1
/* Define to 1 if you have the <strings.h> header file. */ /* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H #undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */ /* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1 #define HAVE_STRING_H 1
/* Define to 1 if you have the `strncasecmp' function. */ /* Define to 1 if you have the `strncasecmp' function. */
#if defined(__MINGW32__) #if defined(__MINGW32__)
#define HAVE_STRNCASECMP 1 #define HAVE_STRNCASECMP 1
#else #else
#undef HAVE_STRNCASECMP #undef HAVE_STRNCASECMP
#endif #endif
#cmakedefine HAVE_STRTOLL #cmakedefine HAVE_STRTOLL
#cmakedefine strtoll @cmake_strtoll@ #cmakedefine strtoll @cmake_strtoll@
#cmakedefine HAVE_STRTOULL #cmakedefine HAVE_STRTOULL
#cmakedefine strtoull @cmake_strtoull@ #cmakedefine strtoull @cmake_strtoull@
/* Define to 1 if you have the <syslog.h> header file. */ /* Define to 1 if you have the <syslog.h> header file. */
#undef HAVE_SYSLOG_H #undef HAVE_SYSLOG_H
/* Define to 1 if you have the <sys/cdefs.h> header file. */ /* Define to 1 if you have the <sys/cdefs.h> header file. */
#define HAVE_SYS_CDEFS_H 1 #define HAVE_SYS_CDEFS_H 1
/* Define to 1 if you have the <sys/param.h> header file. */ /* Define to 1 if you have the <sys/param.h> header file. */
#if defined(__MINGW32__) #if defined(__MINGW32__)
#define HAVE_SYS_PARAM_H 1 #define HAVE_SYS_PARAM_H 1
#else #else
#undef HAVE_SYS_PARAM_H #undef HAVE_SYS_PARAM_H
#endif #endif
/* Define to 1 if you have the <sys/stat.h> header file. */ /* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1 #define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/types.h> header file. */ /* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
#if defined(__MINGW32__) #if defined(__MINGW32__)
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
#else #else
#undef HAVE_UNISTD_H #undef HAVE_UNISTD_H
#endif #endif
/* Define to 1 if you have the `vasprintf' function. */ /* Define to 1 if you have the `vasprintf' function. */
#if defined(__MINGW32__) #if defined(__MINGW32__)
#define HAVE_VASPRINTF 1 #define HAVE_VASPRINTF 1
#else #else
#undef HAVE_VASPRINTF #undef HAVE_VASPRINTF
#endif #endif
/* Define to 1 if you have the `vprintf' function. */ /* Define to 1 if you have the `vprintf' function. */
#define HAVE_VPRINTF 1 #define HAVE_VPRINTF 1
/* Define to 1 if you have the `vsnprintf' function. */ /* Define to 1 if you have the `vsnprintf' function. */
#define HAVE_VSNPRINTF 1 #define HAVE_VSNPRINTF 1
/* Define to 1 if you have the `vsyslog' function. */ /* Define to 1 if you have the `vsyslog' function. */
#undef HAVE_VSYSLOG #undef HAVE_VSYSLOG
/* Define to the sub-directory in which libtool stores uninstalled libraries. /* Define to the sub-directory in which libtool stores uninstalled libraries.
*/ */
#undef LT_OBJDIR #undef LT_OBJDIR
/* Define to 1 if your C compiler doesn't accept -c and -o together. */ /* Define to 1 if your C compiler doesn't accept -c and -o together. */
/* #undef NO_MINUS_C_MINUS_O */ /* #undef NO_MINUS_C_MINUS_O */
/* Name of package */ /* Name of package */
#define PACKAGE "json-c" #define PACKAGE "json-c"
/* Define to the address where bug reports for this package should be sent. */ /* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "json-c@googlegroups.com" #define PACKAGE_BUGREPORT "json-c@googlegroups.com"
/* Define to the full name of this package. */ /* Define to the full name of this package. */
#define PACKAGE_NAME "JSON C Library" #define PACKAGE_NAME "JSON C Library"
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "JSON C Library 0.13.99" #define PACKAGE_STRING "JSON C Library 0.13.99"
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "json-c" #define PACKAGE_TARNAME "json-c"
/* Define to the home page for this package. */ /* Define to the home page for this package. */
#define PACKAGE_URL "https://github.com/json-c/json-c" #define PACKAGE_URL "https://github.com/json-c/json-c"
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "0.13.99" #define PACKAGE_VERSION "0.13.99"
/* Define to 1 if you have the ANSI C header files. */ /* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1 #define STDC_HEADERS 1
/* Version number of package */ /* Version number of package */
#define VERSION "0.13.99" #define VERSION "0.13.99"
/* Define to empty if `const' does not conform to ANSI C. */ /* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */ /* #undef const */
/* Define to rpl_malloc if the replacement function should be used. */ /* Define to rpl_malloc if the replacement function should be used. */
/* #undef malloc */ /* #undef malloc */
/* Define to rpl_realloc if the replacement function should be used. */ /* Define to rpl_realloc if the replacement function should be used. */
/* #undef realloc */ /* #undef realloc */
/* Define to `unsigned int' if <sys/types.h> does not define. */ /* Define to `unsigned int' if <sys/types.h> does not define. */
/* #undef size_t */ /* #undef size_t */