Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added a function to print to pre-allocated buffer #72

Closed
wants to merge 12 commits into from
Closed

Added a function to print to pre-allocated buffer #72

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2387d9d
added Print function call for pre-allocated buffer
Nov 25, 2016
1193d24
fixed "make test" on Mac (clang)
Nov 25, 2016
df093c3
fix shared utils library to also include cjson object
Nov 25, 2016
42496b2
changed to cJSON_PrintPreallocated, added flag in printbuffer
Nov 25, 2016
4150c30
change noalloc struct item to cjbool
Nov 28, 2016
6ce0915
check print_value return
Nov 28, 2016
6e1b4ba
function to print and compare to preallocated buffer
Nov 28, 2016
652bb77
use print_preallocated function to test printout of JSON
Nov 28, 2016
e559516
change buffer length to to int
Nov 28, 2016
e3e7726
more concise return
Nov 28, 2016
32f3316
forgot to add 0, -1 return values
Nov 28, 2016
7083240
fix flags
Nov 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ INSTALL_LIBRARY_PATH = $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)

INSTALL ?= cp -a

R_CFLAGS = -fPIC -std=c89 -pedantic -Wall -Werror -Wstrict-prototypes -Wwrite-strings $(CFLAGS)
R_CFLAGS = -fPIC -std=c89 -pedantic -Wall -Werror -Wstrict-prototypes -Wwrite-strings -Wshadow -Winit-self -Wcast-align -Wformat=2 -Wmissing-prototypes $(CFLAGS)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't try to readd changes that I merged to the master branch already. I will handle merge conflicts myself.

uname := $(shell sh -c 'uname -s 2>/dev/null || echo false')

Expand All @@ -48,8 +48,6 @@ UTILS_SHARED_VERSION = $(UTILS_LIBNAME).$(SHARED).$(LIBVERSION)
UTILS_SHARED_SO = $(UTILS_LIBNAME).$(SHARED).$(UTILS_SOVERSION)
UTILS_STATIC = $(UTILS_LIBNAME).$(STATIC)

SHARED_CMD = $(CC) -shared -o

.PHONY: all shared static tests clean install

all: shared static tests
Expand All @@ -65,15 +63,15 @@ test: tests
./$(UTILS_TEST)

.c.o:
$(CC) -ansi -pedantic -c $(R_CFLAGS) $<
$(CC) -c $(R_CFLAGS) $<

#tests
#cJSON
$(CJSON_TEST): $(CJSON_TEST_SRC) cJSON.h
$(CC) $(CJSON_TEST_SRC) -o $@ $(LDLIBS) -I.
$(CC) $(R_CFLAGS) $(CJSON_TEST_SRC) -o $@ $(LDLIBS) -I.
#cJSON_Utils
$(UTILS_TEST): $(UTILS_TEST_SRC) cJSON.h cJSON_Utils.h
$(CC) $(UTILS_TEST_SRC) -o $@ $(LDLIBS) -I.
$(CC) $(R_CFLAGS) $(UTILS_TEST_SRC) -o $@ $(LDLIBS) -I.

#static libraries
#cJSON
Expand All @@ -86,10 +84,10 @@ $(UTILS_STATIC): $(UTILS_OBJ)
#shared libraries .so.1.0.0
#cJSON
$(CJSON_SHARED_VERSION): $(CJSON_OBJ)
$(CC) -shared -o $@ $< $(LDFLAGS)
$(CC) $(R_CFLAGS) -shared -o $@ $< $(LDFLAGS)
#cJSON_Utils
$(UTILS_SHARED_VERSION): $(UTILS_OBJ) $(CJSON_OBJ)
$(CC) -shared -o $@ $< $(CJSON_OBJ) $(LDFLAGS)
$(CC) $(R_CFLAGS) -shared -o $@ $< $(CJSON_OBJ) $(LDFLAGS)

#objects
#cJSON
Expand Down