Commit 76334666a4e340fdd5e81dee5e613f75ebe69e9c - protobuf-c

New upstream version 1.3.2 Robert Edmonds 4 years ago

17 changed file(s) with 472 addition(s) and 288 deletion(s). Raw diff Collapse all Expand all

+25

-0

ChangeLog less more

	0	protobuf-c (1.3.2)
	1	[ Robert Edmonds ]
	2	* Release 1.3.2.
	3
	4	* Use protobuf 3.7.1 in the Travis-CI environment (#368).
	5
	6	* Fix test suite build failure on newer versions of protobuf (#369).
	7
	8	[ Ilya Lipnitskiy ]
	9	* Fix proto3 repeated scalar field default packing behavior (#330, #377).
	10
	11	[ Adam Cozzette ]
	12	* Fix out-of-bounds read in scan_length_prefixed_data() (#375, #376).
	13
	14	[ Jurriaan Bremer ]
	15	* Fix -Wdeclaration-after-statement warning in parse_oneof_member() (#360).
	16
	17	[ Hayri Ugur Koltuk ]
	18	* Fix SIGSEGV in protobuf_c_message_check() on messages with unpopulated
	19	oneof members (#358).
	20
	21	[ Italo Guerrieri ]
	22	* Do not allow tag values of 0 in protobuf messages, as these are not
	23	allowed by proto2 or proto3 (#299).
	24
0	25	protobuf-c (1.3.1)
1	26
2	27	[ Robert Edmonds ]

+34

-0

Makefile.am less more

249	249	EXTRA_DIST += \
250	250	t/issue251/issue251.proto
251	251
	252	# Issue #330
	253	check_PROGRAMS += \
	254	t/issue330/issue330
	255	TESTS += \
	256	t/issue330/issue330
	257	t_issue330_issue330_SOURCES = \
	258	t/issue330/issue330.c \
	259	t/issue330/issue330.pb-c.c
	260	t_issue330_issue330_LDADD = \
	261	protobuf-c/libprotobuf-c.la
	262	t/issue330/issue330.pb-c.c t/issue330/issue330.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue330/issue330.proto
	263	$(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue330/issue330.proto
	264	BUILT_SOURCES += \
	265	t/issue330/issue330.pb-c.c t/issue330/issue330.pb-c.h
	266	EXTRA_DIST += \
	267	t/issue330/issue330.proto
	268
	269	# Issue #375
	270	check_PROGRAMS += \
	271	t/issue375/issue375
	272	TESTS += \
	273	t/issue375/issue375
	274	t_issue375_issue375_SOURCES = \
	275	t/issue375/issue375.c \
	276	t/issue375/issue375.pb-c.c
	277	t_issue375_issue375_LDADD = \
	278	protobuf-c/libprotobuf-c.la
	279	t/issue375/issue375.pb-c.c t/issue375/issue375.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue375/issue375.proto
	280	$(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue375/issue375.proto
	281	BUILT_SOURCES += \
	282	t/issue375/issue375.pb-c.c t/issue375/issue375.pb-c.h
	283	EXTRA_DIST += \
	284	t/issue375/issue375.proto
	285
252	286	endif # CROSS_COMPILING
253	287
254	288	endif # BUILD_COMPILER

+120

-5

Makefile.in less more

138	138	# Issue #220
139	139
140	140	# Issue #251
	141
	142	# Issue #330
	143
	144	# Issue #375
141	145	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@am__append_11 = t/issue220/issue220 \
142		@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue251/issue251
	146	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue251/issue251 \
	147	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue330/issue330 \
	148	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue375/issue375
143	149	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@am__append_12 = t/issue220/issue220 \
144		@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue251/issue251
	150	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue251/issue251 \
	151	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue330/issue330 \
	152	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue375/issue375
145	153	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@am__append_13 = t/issue220/issue220.pb-c.c \
146	154	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue220/issue220.pb-c.h \
147	155	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue251/issue251.pb-c.c \
148		@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue251/issue251.pb-c.h
	156	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue251/issue251.pb-c.h \
	157	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue330/issue330.pb-c.c \
	158	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue330/issue330.pb-c.h \
	159	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue375/issue375.pb-c.c \
	160	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue375/issue375.pb-c.h
149	161	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@am__append_14 = t/issue220/issue220.proto \
150		@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue251/issue251.proto
	162	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue251/issue251.proto \
	163	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue330/issue330.proto \
	164	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue375/issue375.proto
151	165	subdir = .
152	166	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
153	167	am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \

177	191	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/version/version$(EXEEXT)
178	192	@BUILD_COMPILER_TRUE@@BUILD_PROTO3_TRUE@@CROSS_COMPILING_FALSE@am__EXEEXT_3 = t/generated-code3/test-generated-code3$(EXEEXT)
179	193	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@am__EXEEXT_4 = t/issue220/issue220$(EXEEXT) \
180		@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue251/issue251$(EXEEXT)
	194	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue251/issue251$(EXEEXT) \
	195	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue330/issue330$(EXEEXT) \
	196	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue375/issue375$(EXEEXT)
181	197	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@am__EXEEXT_5 = t/generated-code2/cxx-generate-packed-data$(EXEEXT)
182	198	PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
183	199	am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`;

304	320	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue251/issue251.pb-c.$(OBJEXT)
305	321	t_issue251_issue251_OBJECTS = $(am_t_issue251_issue251_OBJECTS)
306	322	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@t_issue251_issue251_DEPENDENCIES = protobuf-c/libprotobuf-c.la
	323	am__t_issue330_issue330_SOURCES_DIST = t/issue330/issue330.c \
	324	t/issue330/issue330.pb-c.c
	325	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@am_t_issue330_issue330_OBJECTS = t/issue330/issue330.$(OBJEXT) \
	326	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue330/issue330.pb-c.$(OBJEXT)
	327	t_issue330_issue330_OBJECTS = $(am_t_issue330_issue330_OBJECTS)
	328	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@t_issue330_issue330_DEPENDENCIES = protobuf-c/libprotobuf-c.la
	329	am__t_issue375_issue375_SOURCES_DIST = t/issue375/issue375.c \
	330	t/issue375/issue375.pb-c.c
	331	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@am_t_issue375_issue375_OBJECTS = t/issue375/issue375.$(OBJEXT) \
	332	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue375/issue375.pb-c.$(OBJEXT)
	333	t_issue375_issue375_OBJECTS = $(am_t_issue375_issue375_OBJECTS)
	334	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@t_issue375_issue375_DEPENDENCIES = protobuf-c/libprotobuf-c.la
307	335	am__t_version_version_SOURCES_DIST = t/version/version.c
308	336	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@am_t_version_version_OBJECTS = t/version/version.$(OBJEXT)
309	337	t_version_version_OBJECTS = $(am_t_version_version_OBJECTS)

350	378	t/issue220/$(DEPDIR)/issue220.pb-c.Po \
351	379	t/issue251/$(DEPDIR)/issue251.Po \
352	380	t/issue251/$(DEPDIR)/issue251.pb-c.Po \
	381	t/issue330/$(DEPDIR)/issue330.Po \
	382	t/issue330/$(DEPDIR)/issue330.pb-c.Po \
	383	t/issue375/$(DEPDIR)/issue375.Po \
	384	t/issue375/$(DEPDIR)/issue375.pb-c.Po \
353	385	t/version/$(DEPDIR)/version.Po
354	386	am__mv = mv -f
355	387	COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

395	427	$(t_generated_code2_test_generated_code2_SOURCES) \
396	428	$(t_generated_code3_test_generated_code3_SOURCES) \
397	429	$(t_issue220_issue220_SOURCES) $(t_issue251_issue251_SOURCES) \
	430	$(t_issue330_issue330_SOURCES) $(t_issue375_issue375_SOURCES) \
398	431	$(t_version_version_SOURCES)
399	432	DIST_SOURCES = $(protobuf_c_libprotobuf_c_la_SOURCES) \
400	433	$(am__protoc_c_protoc_gen_c_SOURCES_DIST) \

404	437	$(am__t_generated_code3_test_generated_code3_SOURCES_DIST) \
405	438	$(am__t_issue220_issue220_SOURCES_DIST) \
406	439	$(am__t_issue251_issue251_SOURCES_DIST) \
	440	$(am__t_issue330_issue330_SOURCES_DIST) \
	441	$(am__t_issue375_issue375_SOURCES_DIST) \
407	442	$(am__t_version_version_SOURCES_DIST)
408	443	am__can_run_installinfo = \
409	444	case $$AM_UPDATE_INFO_DIR in \

923	958	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@t_issue251_issue251_LDADD = \
924	959	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ protobuf-c/libprotobuf-c.la
925	960
	961	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@t_issue330_issue330_SOURCES = \
	962	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue330/issue330.c \
	963	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue330/issue330.pb-c.c
	964
	965	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@t_issue330_issue330_LDADD = \
	966	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ protobuf-c/libprotobuf-c.la
	967
	968	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@t_issue375_issue375_SOURCES = \
	969	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue375/issue375.c \
	970	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ t/issue375/issue375.pb-c.c
	971
	972	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@t_issue375_issue375_LDADD = \
	973	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ protobuf-c/libprotobuf-c.la
	974
926	975	all: $(BUILT_SOURCES) config.h
927	976	$(MAKE) $(AM_MAKEFLAGS) all-am
928	977

1217	1266	t/issue251/issue251$(EXEEXT): $(t_issue251_issue251_OBJECTS) $(t_issue251_issue251_DEPENDENCIES) $(EXTRA_t_issue251_issue251_DEPENDENCIES) t/issue251/$(am__dirstamp)
1218	1267	@rm -f t/issue251/issue251$(EXEEXT)
1219	1268	$(AM_V_CCLD)$(LINK) $(t_issue251_issue251_OBJECTS) $(t_issue251_issue251_LDADD) $(LIBS)
	1269	t/issue330/$(am__dirstamp):
	1270	@$(MKDIR_P) t/issue330
	1271	@: > t/issue330/$(am__dirstamp)
	1272	t/issue330/$(DEPDIR)/$(am__dirstamp):
	1273	@$(MKDIR_P) t/issue330/$(DEPDIR)
	1274	@: > t/issue330/$(DEPDIR)/$(am__dirstamp)
	1275	t/issue330/issue330.$(OBJEXT): t/issue330/$(am__dirstamp) \
	1276	t/issue330/$(DEPDIR)/$(am__dirstamp)
	1277	t/issue330/issue330.pb-c.$(OBJEXT): t/issue330/$(am__dirstamp) \
	1278	t/issue330/$(DEPDIR)/$(am__dirstamp)
	1279
	1280	t/issue330/issue330$(EXEEXT): $(t_issue330_issue330_OBJECTS) $(t_issue330_issue330_DEPENDENCIES) $(EXTRA_t_issue330_issue330_DEPENDENCIES) t/issue330/$(am__dirstamp)
	1281	@rm -f t/issue330/issue330$(EXEEXT)
	1282	$(AM_V_CCLD)$(LINK) $(t_issue330_issue330_OBJECTS) $(t_issue330_issue330_LDADD) $(LIBS)
	1283	t/issue375/$(am__dirstamp):
	1284	@$(MKDIR_P) t/issue375
	1285	@: > t/issue375/$(am__dirstamp)
	1286	t/issue375/$(DEPDIR)/$(am__dirstamp):
	1287	@$(MKDIR_P) t/issue375/$(DEPDIR)
	1288	@: > t/issue375/$(DEPDIR)/$(am__dirstamp)
	1289	t/issue375/issue375.$(OBJEXT): t/issue375/$(am__dirstamp) \
	1290	t/issue375/$(DEPDIR)/$(am__dirstamp)
	1291	t/issue375/issue375.pb-c.$(OBJEXT): t/issue375/$(am__dirstamp) \
	1292	t/issue375/$(DEPDIR)/$(am__dirstamp)
	1293
	1294	t/issue375/issue375$(EXEEXT): $(t_issue375_issue375_OBJECTS) $(t_issue375_issue375_DEPENDENCIES) $(EXTRA_t_issue375_issue375_DEPENDENCIES) t/issue375/$(am__dirstamp)
	1295	@rm -f t/issue375/issue375$(EXEEXT)
	1296	$(AM_V_CCLD)$(LINK) $(t_issue375_issue375_OBJECTS) $(t_issue375_issue375_LDADD) $(LIBS)
1220	1297	t/version/$(am__dirstamp):
1221	1298	@$(MKDIR_P) t/version
1222	1299	@: > t/version/$(am__dirstamp)

1240	1317	-rm -f t/generated-code2/*.$(OBJEXT)
1241	1318	-rm -f t/issue220/*.$(OBJEXT)
1242	1319	-rm -f t/issue251/*.$(OBJEXT)
	1320	-rm -f t/issue330/*.$(OBJEXT)
	1321	-rm -f t/issue375/*.$(OBJEXT)
1243	1322	-rm -f t/version/*.$(OBJEXT)
1244	1323
1245	1324	distclean-compile:

1273	1352	@AMDEP_TRUE@@am__include@ @am__quote@t/issue220/$(DEPDIR)/issue220.pb-c.Po@am__quote@ # am--include-marker
1274	1353	@AMDEP_TRUE@@am__include@ @am__quote@t/issue251/$(DEPDIR)/issue251.Po@am__quote@ # am--include-marker
1275	1354	@AMDEP_TRUE@@am__include@ @am__quote@t/issue251/$(DEPDIR)/issue251.pb-c.Po@am__quote@ # am--include-marker
	1355	@AMDEP_TRUE@@am__include@ @am__quote@t/issue330/$(DEPDIR)/issue330.Po@am__quote@ # am--include-marker
	1356	@AMDEP_TRUE@@am__include@ @am__quote@t/issue330/$(DEPDIR)/issue330.pb-c.Po@am__quote@ # am--include-marker
	1357	@AMDEP_TRUE@@am__include@ @am__quote@t/issue375/$(DEPDIR)/issue375.Po@am__quote@ # am--include-marker
	1358	@AMDEP_TRUE@@am__include@ @am__quote@t/issue375/$(DEPDIR)/issue375.pb-c.Po@am__quote@ # am--include-marker
1276	1359	@AMDEP_TRUE@@am__include@ @am__quote@t/version/$(DEPDIR)/version.Po@am__quote@ # am--include-marker
1277	1360
1278	1361	$(am__depfiles_remade):

1593	1676	-rm -rf t/generated-code3/.libs t/generated-code3/_libs
1594	1677	-rm -rf t/issue220/.libs t/issue220/_libs
1595	1678	-rm -rf t/issue251/.libs t/issue251/_libs
	1679	-rm -rf t/issue330/.libs t/issue330/_libs
	1680	-rm -rf t/issue375/.libs t/issue375/_libs
1596	1681	-rm -rf t/version/.libs t/version/_libs
1597	1682
1598	1683	distclean-libtool:

1885	1970	--log-file $$b.log --trs-file $$b.trs \
1886	1971	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1887	1972	"$$tst" $(AM_TESTS_FD_REDIRECT)
	1973	t/issue330/issue330.log: t/issue330/issue330$(EXEEXT)
	1974	@p='t/issue330/issue330$(EXEEXT)'; \
	1975	b='t/issue330/issue330'; \
	1976	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
	1977	--log-file $$b.log --trs-file $$b.trs \
	1978	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
	1979	"$$tst" $(AM_TESTS_FD_REDIRECT)
	1980	t/issue375/issue375.log: t/issue375/issue375$(EXEEXT)
	1981	@p='t/issue375/issue375$(EXEEXT)'; \
	1982	b='t/issue375/issue375'; \
	1983	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
	1984	--log-file $$b.log --trs-file $$b.trs \
	1985	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
	1986	"$$tst" $(AM_TESTS_FD_REDIRECT)
1888	1987	.test.log:
1889	1988	@p='$<'; \
1890	1989	$(am__set_b); \

2128	2227	-rm -f t/issue220/$(am__dirstamp)
2129	2228	-rm -f t/issue251/$(DEPDIR)/$(am__dirstamp)
2130	2229	-rm -f t/issue251/$(am__dirstamp)
	2230	-rm -f t/issue330/$(DEPDIR)/$(am__dirstamp)
	2231	-rm -f t/issue330/$(am__dirstamp)
	2232	-rm -f t/issue375/$(DEPDIR)/$(am__dirstamp)
	2233	-rm -f t/issue375/$(am__dirstamp)
2131	2234	-rm -f t/version/$(DEPDIR)/$(am__dirstamp)
2132	2235	-rm -f t/version/$(am__dirstamp)
2133	2236	-test -z "$(DISTCLEANFILES)" \|\| rm -f $(DISTCLEANFILES)

2175	2278	-rm -f t/issue220/$(DEPDIR)/issue220.pb-c.Po
2176	2279	-rm -f t/issue251/$(DEPDIR)/issue251.Po
2177	2280	-rm -f t/issue251/$(DEPDIR)/issue251.pb-c.Po
	2281	-rm -f t/issue330/$(DEPDIR)/issue330.Po
	2282	-rm -f t/issue330/$(DEPDIR)/issue330.pb-c.Po
	2283	-rm -f t/issue375/$(DEPDIR)/issue375.Po
	2284	-rm -f t/issue375/$(DEPDIR)/issue375.pb-c.Po
2178	2285	-rm -f t/version/$(DEPDIR)/version.Po
2179	2286	-rm -f Makefile
2180	2287	distclean-am: clean-am distclean-compile distclean-generic \

2253	2360	-rm -f t/issue220/$(DEPDIR)/issue220.pb-c.Po
2254	2361	-rm -f t/issue251/$(DEPDIR)/issue251.Po
2255	2362	-rm -f t/issue251/$(DEPDIR)/issue251.pb-c.Po
	2363	-rm -f t/issue330/$(DEPDIR)/issue330.Po
	2364	-rm -f t/issue330/$(DEPDIR)/issue330.pb-c.Po
	2365	-rm -f t/issue375/$(DEPDIR)/issue375.Po
	2366	-rm -f t/issue375/$(DEPDIR)/issue375.pb-c.Po
2256	2367	-rm -f t/version/$(DEPDIR)/version.Po
2257	2368	-rm -f Makefile
2258	2369	maintainer-clean-am: distclean-am maintainer-clean-generic

2334	2445	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue220/issue220.proto
2335	2446	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@t/issue251/issue251.pb-c.c t/issue251/issue251.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue251/issue251.proto
2336	2447	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue251/issue251.proto
	2448	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@t/issue330/issue330.pb-c.c t/issue330/issue330.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue330/issue330.proto
	2449	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue330/issue330.proto
	2450	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@t/issue375/issue375.pb-c.c t/issue375/issue375.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue375/issue375.proto
	2451	@BUILD_COMPILER_TRUE@@CROSS_COMPILING_FALSE@ $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue375/issue375.proto
2337	2452
2338	2453	dist-hook:
2339	2454	rm -f `find $(distdir) -name '.pb-c.[ch]' -o -name '.pb.cc' -o -name '*.pb.h'`

+145

-242

build-aux/ltmain.sh less more

30	30
31	31	PROGRAM=libtool
32	32	PACKAGE=libtool
33		VERSION="2.4.6 Debian-2.4.6-2.1"
	33	VERSION="2.4.6 Debian-2.4.6-10"
34	34	package_revision=2.4.6
35	35
36	36

63	63	# libraries, which are installed to $pkgauxdir.
64	64
65	65	# Set a version string for this script.
66		scriptversion=2015-10-12.13; # UTC
	66	scriptversion=2015-01-20.17; # UTC
67	67
68	68	# General shell script boiler plate, and helper functions.
69	69	# Written by Gary V. Vaughan, 2004

579	579	{
580	580	$debug_cmd
581	581
582		func_quote_arg pretty "$2"
583		eval "$1+=\\ \$func_quote_arg_result"
	582	func_quote_for_eval "$2"
	583	eval "$1+=\\ \$func_quote_for_eval_result"
584	584	}'
585	585	else
586	586	func_append_quoted ()
587	587	{
588	588	$debug_cmd
589	589
590		func_quote_arg pretty "$2"
591		eval "$1=\$$1\\ \$func_quote_arg_result"
	590	func_quote_for_eval "$2"
	591	eval "$1=\$$1\\ \$func_quote_for_eval_result"
592	592	}
593	593	fi
594	594

1090	1090	}
1091	1091
1092	1092
1093		# func_quote_portable EVAL ARG
1094		# ----------------------------
1095		# Internal function to portably implement func_quote_arg. Note that we still
1096		# keep attention to performance here so we as much as possible try to avoid
1097		# calling sed binary (so far O(N) complexity as long as func_append is O(1)).
1098		func_quote_portable ()
	1093	# func_quote_for_eval ARG...
	1094	# --------------------------
	1095	# Aesthetically quote ARGs to be evaled later.
	1096	# This function returns two values:
	1097	# i) func_quote_for_eval_result
	1098	# double-quoted, suitable for a subsequent eval
	1099	# ii) func_quote_for_eval_unquoted_result
	1100	# has all characters that are still active within double
	1101	# quotes backslashified.
	1102	func_quote_for_eval ()
1099	1103	{
1100	1104	$debug_cmd
1101	1105
1102		func_quote_portable_result=$2
1103
1104		# one-time-loop (easy break)
1105		while true
1106		do
1107		if $1; then
1108		func_quote_portable_result=`$ECHO "$2" \| $SED \
1109		-e "$sed_double_quote_subst" -e "$sed_double_backslash"`
1110		break
	1106	func_quote_for_eval_unquoted_result=
	1107	func_quote_for_eval_result=
	1108	while test 0 -lt $#; do
	1109	case $1 in
	1110	[\\\`\"\$])
	1111	_G_unquoted_arg=`printf '%s\n' "$1" \|$SED "$sed_quote_subst"` ;;
	1112	*)
	1113	_G_unquoted_arg=$1 ;;
	1114	esac
	1115	if test -n "$func_quote_for_eval_unquoted_result"; then
	1116	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
	1117	else
	1118	func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
1111	1119	fi
1112	1120
1113		# Quote for eval.
1114		case $func_quote_portable_result in
1115		[\\\`\"\$])
1116		case $func_quote_portable_result in
1117		[\[\\?]*)
1118		func_quote_portable_result=`$ECHO "$func_quote_portable_result" \| $SED "$sed_quote_subst"`
1119		break
1120		;;
1121		esac
1122
1123		func_quote_portable_old_IFS=$IFS
1124		for _G_char in '\' '`' '"' '$'
1125		do
1126		# STATE($1) PREV($2) SEPARATOR($3)
1127		set start "" ""
1128		func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy
1129		IFS=$_G_char
1130		for _G_part in $func_quote_portable_result
1131		do
1132		case $1 in
1133		quote)
1134		func_append func_quote_portable_result "$3$2"
1135		set quote "$_G_part" "\\$_G_char"
1136		;;
1137		start)
1138		set first "" ""
1139		func_quote_portable_result=
1140		;;
1141		first)
1142		set quote "$_G_part" ""
1143		;;
1144		esac
1145		done
1146		done
1147		IFS=$func_quote_portable_old_IFS
	1121	case $_G_unquoted_arg in
	1122	# Double-quote args containing shell metacharacters to delay
	1123	# word splitting, command substitution and variable expansion
	1124	# for a subsequent eval.
	1125	# Many Bourne shells cannot handle close brackets correctly
	1126	# in scan sets, so we specify it separately.
	1127	[\[\~\#\^\&\\{\}\\|\;\<\>\?\'\ \ ]\|]*\|"")
	1128	_G_quoted_arg=\"$_G_unquoted_arg\"
1148	1129	;;
1149		*) ;;
	1130	*)
	1131	_G_quoted_arg=$_G_unquoted_arg
	1132	;;
1150	1133	esac
1151		break
1152		done
1153
1154		func_quote_portable_unquoted_result=$func_quote_portable_result
1155		case $func_quote_portable_result in
1156		# double-quote args containing shell metacharacters to delay
1157		# word splitting, command substitution and variable expansion
1158		# for a subsequent eval.
1159		# many bourne shells cannot handle close brackets correctly
1160		# in scan sets, so we specify it separately.
1161		[\[\~\#\^\&\\{\}\\|\;\<\>\?\'\ \ ]\|]*\|"")
1162		func_quote_portable_result=\"$func_quote_portable_result\"
1163		;;
1164		esac
1165		}
1166
1167
1168		# func_quotefast_eval ARG
1169		# -----------------------
1170		# Quote one ARG (internal). This is equivalent to 'func_quote_arg eval ARG',
1171		# but optimized for speed. Result is stored in $func_quotefast_eval.
1172		if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then
1173		func_quotefast_eval ()
1174		{
1175		printf -v func_quotefast_eval_result %q "$1"
1176		}
1177		else
1178		func_quotefast_eval ()
1179		{
1180		func_quote_portable false "$1"
1181		func_quotefast_eval_result=$func_quote_portable_result
1182		}
1183		fi
1184
1185
1186		# func_quote_arg MODEs ARG
1187		# ------------------------
1188		# Quote one ARG to be evaled later. MODEs argument may contain zero ore more
1189		# specifiers listed below separated by ',' character. This function returns two
1190		# values:
1191		# i) func_quote_arg_result
1192		# double-quoted (when needed), suitable for a subsequent eval
1193		# ii) func_quote_arg_unquoted_result
1194		# has all characters that are still active within double
1195		# quotes backslashified. Available only if 'unquoted' is specified.
1196		#
1197		# Available modes:
1198		# ----------------
1199		# 'eval' (default)
1200		# - escape shell special characters
1201		# 'expand'
1202		# - the same as 'eval'; but do not quote variable references
1203		# 'pretty'
1204		# - request aesthetic output, i.e. '"a b"' instead of 'a\ b'. This might
1205		# later used in func_quote to get output like: 'echo "a b"' instead of
1206		# 'echo a\ b'. This is slower than default on some shells.
1207		# 'unquoted'
1208		# - produce also $func_quote_arg_unquoted_result which does not contain
1209		# wrapping double-quotes.
1210		#
1211		# Examples for 'func_quote_arg pretty,unquoted string':
1212		#
1213		# string \| _result \| _unquoted_result
1214		# ------------+-----------------------+-------------------
1215		# " \| \" \| \"
1216		# a b \| "a b" \| a b
1217		# "a b" \| "\"a b\"" \| \"a b\"
1218		# * \| "" \|
1219		# z="${x-$y}" \| "z=\"\${x-\$y}\"" \| z=\"\${x-\$y}\"
1220		#
1221		# Examples for 'func_quote_arg pretty,unquoted,expand string':
1222		#
1223		# string \| _result \| _unquoted_result
1224		# --------------+---------------------+--------------------
1225		# z="${x-$y}" \| "z=\"${x-$y}\"" \| z=\"${x-$y}\"
1226		func_quote_arg ()
1227		{
1228		_G_quote_expand=false
1229		case ,$1, in
1230		,expand,)
1231		_G_quote_expand=:
1232		;;
1233		esac
1234
1235		case ,$1, in
1236		,pretty,\|,expand,\|,unquoted,)
1237		func_quote_portable $_G_quote_expand "$2"
1238		func_quote_arg_result=$func_quote_portable_result
1239		func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result
1240		;;
1241		*)
1242		# Faster quote-for-eval for some shells.
1243		func_quotefast_eval "$2"
1244		func_quote_arg_result=$func_quotefast_eval_result
1245		;;
1246		esac
1247		}
1248
1249
1250		# func_quote MODEs ARGs...
1251		# ------------------------
1252		# Quote all ARGs to be evaled later and join them into single command. See
1253		# func_quote_arg's description for more info.
1254		func_quote ()
1255		{
1256		$debug_cmd
1257		_G_func_quote_mode=$1 ; shift
1258		func_quote_result=
1259		while test 0 -lt $#; do
1260		func_quote_arg "$_G_func_quote_mode" "$1"
1261		if test -n "$func_quote_result"; then
1262		func_append func_quote_result " $func_quote_arg_result"
	1134
	1135	if test -n "$func_quote_for_eval_result"; then
	1136	func_append func_quote_for_eval_result " $_G_quoted_arg"
1263	1137	else
1264		func_append func_quote_result "$func_quote_arg_result"
	1138	func_append func_quote_for_eval_result "$_G_quoted_arg"
1265	1139	fi
1266	1140	shift
1267	1141	done
	1142	}
	1143
	1144
	1145	# func_quote_for_expand ARG
	1146	# -------------------------
	1147	# Aesthetically quote ARG to be evaled later; same as above,
	1148	# but do not quote variable references.
	1149	func_quote_for_expand ()
	1150	{
	1151	$debug_cmd
	1152
	1153	case $1 in
	1154	[\\\`\"])
	1155	_G_arg=`$ECHO "$1" \| $SED \
	1156	-e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
	1157	*)
	1158	_G_arg=$1 ;;
	1159	esac
	1160
	1161	case $_G_arg in
	1162	# Double-quote args containing shell metacharacters to delay
	1163	# word splitting and command substitution for a subsequent eval.
	1164	# Many Bourne shells cannot handle close brackets correctly
	1165	# in scan sets, so we specify it separately.
	1166	[\[\~\#\^\&\\{\}\\|\;\<\>\?\'\ \ ]\|]*\|"")
	1167	_G_arg=\"$_G_arg\"
	1168	;;
	1169	esac
	1170
	1171	func_quote_for_expand_result=$_G_arg
1268	1172	}
1269	1173
1270	1174

1310	1214	_G_cmd=$1
1311	1215	_G_fail_exp=${2-':'}
1312	1216
1313		func_quote_arg pretty,expand "$_G_cmd"
1314		eval "func_notquiet $func_quote_arg_result"
	1217	func_quote_for_expand "$_G_cmd"
	1218	eval "func_notquiet $func_quote_for_expand_result"
1315	1219
1316	1220	$opt_dry_run \|\| {
1317	1221	eval "$_G_cmd"

1336	1240	_G_fail_exp=${2-':'}
1337	1241
1338	1242	$opt_quiet \|\| {
1339		func_quote_arg expand,pretty "$_G_cmd"
1340		eval "func_echo $func_quote_arg_result"
	1243	func_quote_for_expand "$_G_cmd"
	1244	eval "func_echo $func_quote_for_expand_result"
1341	1245	}
1342	1246
1343	1247	$opt_dry_run \|\| {

1465	1369	#! /bin/sh
1466	1370
1467	1371	# Set a version string for this script.
1468		scriptversion=2015-10-12.13; # UTC
	1372	scriptversion=2015-10-07.11; # UTC
1469	1373
1470	1374	# A portable, pluggable option parser for Bourne shell.
1471	1375	# Written by Gary V. Vaughan, 2010

1675	1579	# '
1676	1580	# # No change in '$@' (ignored completely by this hook). There is
1677	1581	# # no need to do the equivalent (but slower) action:
1678		# # func_quote eval ${1+"$@"}
1679		# # my_options_prep_result=$func_quote_result
	1582	# # func_quote_for_eval ${1+"$@"}
	1583	# # my_options_prep_result=$func_quote_for_eval_result
1680	1584	# false
1681	1585	# }
1682	1586	# func_add_hook func_options_prep my_options_prep

1712	1616	# done
1713	1617	#
1714	1618	# if $args_changed; then
1715		# func_quote eval ${1+"$@"}
1716		# my_silent_option_result=$func_quote_result
	1619	# func_quote_for_eval ${1+"$@"}
	1620	# my_silent_option_result=$func_quote_for_eval_result
1717	1621	# fi
1718	1622	#
1719	1623	# $args_changed

1780	1684	if $_G_rc_options; then
1781	1685	func_options_result=$_G_res_var
1782	1686	else
1783		func_quote eval ${1+"$@"}
1784		func_options_result=$func_quote_result
	1687	func_quote_for_eval ${1+"$@"}
	1688	func_options_result=$func_quote_for_eval_result
1785	1689	fi
1786	1690
1787	1691	$_G_rc_options

1924	1828
1925	1829	if $_G_rc_parse_options; then
1926	1830	# save modified positional parameters for caller
1927		func_quote eval ${1+"$@"}
1928		func_parse_options_result=$func_quote_result
	1831	func_quote_for_eval ${1+"$@"}
	1832	func_parse_options_result=$func_quote_for_eval_result
1929	1833	fi
1930	1834
1931	1835	$_G_rc_parse_options

2236	2140	compiler: $LTCC
2237	2141	compiler flags: $LTCFLAGS
2238	2142	linker: $LD (gnu? $with_gnu_ld)
2239		version: $progname $scriptversion Debian-2.4.6-2.1
	2143	version: $progname $scriptversion Debian-2.4.6-10
2240	2144	automake: `($AUTOMAKE --version) 2>/dev/null \|$SED 1q`
2241	2145	autoconf: `($AUTOCONF --version) 2>/dev/null \|$SED 1q`
2242	2146

2470	2374
2471	2375	if $_G_rc_lt_options_prep; then
2472	2376	# Pass back the list of options.
2473		func_quote eval ${1+"$@"}
2474		libtool_options_prep_result=$func_quote_result
	2377	func_quote_for_eval ${1+"$@"}
	2378	libtool_options_prep_result=$func_quote_for_eval_result
2475	2379	fi
2476	2380
2477	2381	$_G_rc_lt_options_prep

2577	2481
2578	2482	if $_G_rc_lt_parse_options; then
2579	2483	# save modified positional parameters for caller
2580		func_quote eval ${1+"$@"}
2581		libtool_parse_options_result=$func_quote_result
	2484	func_quote_for_eval ${1+"$@"}
	2485	libtool_parse_options_result=$func_quote_for_eval_result
2582	2486	fi
2583	2487
2584	2488	$_G_rc_lt_parse_options

2638	2542	}
2639	2543
2640	2544	# Pass back the unparsed argument list
2641		func_quote eval ${1+"$@"}
2642		libtool_validate_options_result=$func_quote_result
	2545	func_quote_for_eval ${1+"$@"}
	2546	libtool_validate_options_result=$func_quote_for_eval_result
2643	2547	}
2644	2548	func_add_hook func_validate_options libtool_validate_options
2645	2549

3605	3509	esac
3606	3510	done
3607	3511
3608		func_quote_arg pretty "$libobj"
3609		test "X$libobj" != "X$func_quote_arg_result" \
	3512	func_quote_for_eval "$libobj"
	3513	test "X$libobj" != "X$func_quote_for_eval_result" \
3610	3514	&& $ECHO "X$libobj" \| $GREP '[]~#^*{};<>?"'"'"' &()\|`$[]' \
3611	3515	&& func_warning "libobj name '$libobj' may not contain shell special characters."
3612	3516	func_dirname_and_basename "$obj" "/" ""

3679	3583
3680	3584	func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
3681	3585	srcfile=$func_to_tool_file_result
3682		func_quote_arg pretty "$srcfile"
3683		qsrcfile=$func_quote_arg_result
	3586	func_quote_for_eval "$srcfile"
	3587	qsrcfile=$func_quote_for_eval_result
3684	3588
3685	3589	# Only build a PIC object if we are building libtool libraries.
3686	3590	if test yes = "$build_libtool_libs"; then

4283	4187	case $nonopt in shtool) :;; *) false;; esac
4284	4188	then
4285	4189	# Aesthetically quote it.
4286		func_quote_arg pretty "$nonopt"
4287		install_prog="$func_quote_arg_result "
	4190	func_quote_for_eval "$nonopt"
	4191	install_prog="$func_quote_for_eval_result "
4288	4192	arg=$1
4289	4193	shift
4290	4194	else

4294	4198
4295	4199	# The real first argument should be the name of the installation program.
4296	4200	# Aesthetically quote it.
4297		func_quote_arg pretty "$arg"
4298		func_append install_prog "$func_quote_arg_result"
	4201	func_quote_for_eval "$arg"
	4202	func_append install_prog "$func_quote_for_eval_result"
4299	4203	install_shared_prog=$install_prog
4300	4204	case " $install_prog " in
4301	4205	[\\\ /]cp\ ) install_cp=: ;;

4352	4256	esac
4353	4257
4354	4258	# Aesthetically quote the argument.
4355		func_quote_arg pretty "$arg"
4356		func_append install_prog " $func_quote_arg_result"
	4259	func_quote_for_eval "$arg"
	4260	func_append install_prog " $func_quote_for_eval_result"
4357	4261	if test -n "$arg2"; then
4358		func_quote_arg pretty "$arg2"
	4262	func_quote_for_eval "$arg2"
4359	4263	fi
4360		func_append install_shared_prog " $func_quote_arg_result"
	4264	func_append install_shared_prog " $func_quote_for_eval_result"
4361	4265	done
4362	4266
4363	4267	test -z "$install_prog" && \

4368	4272
4369	4273	if test -n "$install_override_mode" && $no_mode; then
4370	4274	if $install_cp; then :; else
4371		func_quote_arg pretty "$install_override_mode"
4372		func_append install_shared_prog " -m $func_quote_arg_result"
	4275	func_quote_for_eval "$install_override_mode"
	4276	func_append install_shared_prog " -m $func_quote_for_eval_result"
4373	4277	fi
4374	4278	fi
4375	4279

4665	4569	relink_command=`$ECHO "$relink_command" \| $SED 's%@OUTPUT@%'"$outputname"'%g'`
4666	4570
4667	4571	$opt_quiet \|\| {
4668		func_quote_arg expand,pretty "$relink_command"
4669		eval "func_echo $func_quote_arg_result"
	4572	func_quote_for_expand "$relink_command"
	4573	eval "func_echo $func_quote_for_expand_result"
4670	4574	}
4671	4575	if eval "$relink_command"; then :
4672	4576	else

5445	5349	if test \"\$libtool_execute_magic\" != \"$magic\"; then
5446	5350	file=\"\$0\""
5447	5351
5448		func_quote_arg pretty "$ECHO"
5449		qECHO=$func_quote_arg_result
	5352	qECHO=`$ECHO "$ECHO" \| $SED "$sed_quote_subst"`
5450	5353	$ECHO "\
5451	5354
5452	5355	# A function that is used when there is no print builtin or printf.

5456	5359	\$1
5457	5360	_LTECHO_EOF'
5458	5361	}
5459		ECHO=$qECHO
	5362	ECHO=\"$qECHO\"
5460	5363	fi
5461	5364
5462	5365	# Very basic option parsing. These options are (a) specific to

6799	6702	while test "$#" -gt 0; do
6800	6703	arg=$1
6801	6704	shift
6802		func_quote_arg pretty,unquoted "$arg"
6803		qarg=$func_quote_arg_unquoted_result
6804		func_append libtool_args " $func_quote_arg_result"
	6705	func_quote_for_eval "$arg"
	6706	qarg=$func_quote_for_eval_unquoted_result
	6707	func_append libtool_args " $func_quote_for_eval_result"
6805	6708
6806	6709	# If the previous option needs an argument, assign it.
6807	6710	if test -n "$prev"; then

7399	7302	save_ifs=$IFS; IFS=,
7400	7303	for flag in $args; do
7401	7304	IFS=$save_ifs
7402		func_quote_arg pretty "$flag"
7403		func_append arg " $func_quote_arg_result"
7404		func_append compiler_flags " $func_quote_arg_result"
	7305	func_quote_for_eval "$flag"
	7306	func_append arg " $func_quote_for_eval_result"
	7307	func_append compiler_flags " $func_quote_for_eval_result"
7405	7308	done
7406	7309	IFS=$save_ifs
7407	7310	func_stripname ' ' '' "$arg"

7415	7318	save_ifs=$IFS; IFS=,
7416	7319	for flag in $args; do
7417	7320	IFS=$save_ifs
7418		func_quote_arg pretty "$flag"
7419		func_append arg " $wl$func_quote_arg_result"
7420		func_append compiler_flags " $wl$func_quote_arg_result"
7421		func_append linker_flags " $func_quote_arg_result"
	7321	func_quote_for_eval "$flag"
	7322	func_append arg " $wl$func_quote_for_eval_result"
	7323	func_append compiler_flags " $wl$func_quote_for_eval_result"
	7324	func_append linker_flags " $func_quote_for_eval_result"
7422	7325	done
7423	7326	IFS=$save_ifs
7424	7327	func_stripname ' ' '' "$arg"

7442	7345
7443	7346	# -msg_* for osf cc
7444	7347	-msg_*)
7445		func_quote_arg pretty "$arg"
7446		arg=$func_quote_arg_result
	7348	func_quote_for_eval "$arg"
	7349	arg=$func_quote_for_eval_result
7447	7350	;;
7448	7351
7449	7352	# Flags to be passed through unchanged, with rationale:

7463	7366	# -specs=* GCC specs files
7464	7367	# -stdlib=* select c++ std lib with clang
7465	7368	# -fsanitize=* Clang/GCC memory and address sanitizer
	7369	# -fuse-ld=* Linker select flags for GCC
7466	7370	-64\|-mips[0-9]\|-r[0-9][0-9]\|-xarch=\|-xtarget=\|+DA\|+DD\|-q\|-m*\| \
7467	7371	-t[45]\|-txscale\|-p\|-pg\|--coverage\|-fprofile-\|-F\|@\|-tp=\|--sysroot=*\| \
7468	7372	-O\|-g\|-flto\|-fwhopr\|-fuse-linker-plugin\|-fstack-protector\|-stdlib=\| \
7469		-specs=\|-fsanitize=)
7470		func_quote_arg pretty "$arg"
7471		arg=$func_quote_arg_result
	7373	-specs=\|-fsanitize=\|-fuse-ld=*)
	7374	func_quote_for_eval "$arg"
	7375	arg=$func_quote_for_eval_result
7472	7376	func_append compile_command " $arg"
7473	7377	func_append finalize_command " $arg"
7474	7378	func_append compiler_flags " $arg"

7489	7393	continue
7490	7394	else
7491	7395	# Otherwise treat like 'Some other compiler flag' below
7492		func_quote_arg pretty "$arg"
7493		arg=$func_quote_arg_result
	7396	func_quote_for_eval "$arg"
	7397	arg=$func_quote_for_eval_result
7494	7398	fi
7495	7399	;;
7496	7400
7497	7401	# Some other compiler flag.
7498	7402	-* \| +*)
7499		func_quote_arg pretty "$arg"
7500		arg=$func_quote_arg_result
	7403	func_quote_for_eval "$arg"
	7404	arg=$func_quote_for_eval_result
7501	7405	;;
7502	7406
7503	7407	*.$objext)

7617	7521	*)
7618	7522	# Unknown arguments in both finalize_command and compile_command need
7619	7523	# to be aesthetically quoted because they are evaled later.
7620		func_quote_arg pretty "$arg"
7621		arg=$func_quote_arg_result
	7524	func_quote_for_eval "$arg"
	7525	arg=$func_quote_for_eval_result
7622	7526	;;
7623	7527	esac # arg
7624	7528

10130	10034	for cmd in $concat_cmds; do
10131	10035	IFS=$save_ifs
10132	10036	$opt_quiet \|\| {
10133		func_quote_arg expand,pretty "$cmd"
10134		eval "func_echo $func_quote_arg_result"
	10037	func_quote_for_expand "$cmd"
	10038	eval "func_echo $func_quote_for_expand_result"
10135	10039	}
10136	10040	$opt_dry_run \|\| eval "$cmd" \|\| {
10137	10041	lt_exit=$?

10224	10128	eval cmd=\"$cmd\"
10225	10129	IFS=$save_ifs
10226	10130	$opt_quiet \|\| {
10227		func_quote_arg expand,pretty "$cmd"
10228		eval "func_echo $func_quote_arg_result"
	10131	func_quote_for_expand "$cmd"
	10132	eval "func_echo $func_quote_for_expand_result"
10229	10133	}
10230	10134	$opt_dry_run \|\| eval "$cmd" \|\| {
10231	10135	lt_exit=$?

10699	10603	elif eval var_value=\$$var; test -z "$var_value"; then
10700	10604	relink_command="$var=; export $var; $relink_command"
10701	10605	else
10702		func_quote_arg pretty "$var_value"
10703		relink_command="$var=$func_quote_arg_result; export $var; $relink_command"
	10606	func_quote_for_eval "$var_value"
	10607	relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
10704	10608	fi
10705	10609	done
10706		func_quote_arg pretty,unquoted "(cd `pwd`; $relink_command)"
10707		relink_command=$func_quote_arg_unquoted_result
	10610	relink_command="(cd `pwd`; $relink_command)"
	10611	relink_command=`$ECHO "$relink_command" \| $SED "$sed_quote_subst"`
10708	10612	fi
10709	10613
10710	10614	# Only actually do things if not in dry run mode.

10944	10848	elif eval var_value=\$$var; test -z "$var_value"; then
10945	10849	relink_command="$var=; export $var; $relink_command"
10946	10850	else
10947		func_quote_arg pretty,unquoted "$var_value"
10948		relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command"
	10851	func_quote_for_eval "$var_value"
	10852	relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
10949	10853	fi
10950	10854	done
10951	10855	# Quote the link command for shipping.
10952	10856	relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
10953		func_quote_arg pretty,unquoted "$relink_command"
10954		relink_command=$func_quote_arg_unquoted_result
	10857	relink_command=`$ECHO "$relink_command" \| $SED "$sed_quote_subst"`
10955	10858	if test yes = "$hardcode_automatic"; then
10956	10859	relink_command=
10957	10860	fi

-1

build-cmake/CMakeLists.txt less more

0	0	SET(PACKAGE protobuf-c)
1	1	SET(PACKAGE_NAME protobuf-c)
2		SET(PACKAGE_VERSION 1.3.1)
	2	SET(PACKAGE_VERSION 1.3.2)
3	3
4	4
5	5	CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)

+24

-21

configure less more

0	0	#! /bin/sh
1	1	# Guess values for system-dependent variables and create Makefiles.
2		# Generated by GNU Autoconf 2.69 for protobuf-c 1.3.1.
	2	# Generated by GNU Autoconf 2.69 for protobuf-c 1.3.2.
3	3	#
4	4	# Report bugs to <https://github.com/protobuf-c/protobuf-c/issues>.
5	5	#

589	589	# Identity of this package.
590	590	PACKAGE_NAME='protobuf-c'
591	591	PACKAGE_TARNAME='protobuf-c'
592		PACKAGE_VERSION='1.3.1'
593		PACKAGE_STRING='protobuf-c 1.3.1'
	592	PACKAGE_VERSION='1.3.2'
	593	PACKAGE_STRING='protobuf-c 1.3.2'
594	594	PACKAGE_BUGREPORT='https://github.com/protobuf-c/protobuf-c/issues'
595	595	PACKAGE_URL='https://github.com/protobuf-c/protobuf-c'
596	596

1377	1377	# Omit some internal or obsolete options to make the list less imposing.
1378	1378	# This message is too long to be a string in the A/UX 3.1 sh.
1379	1379	cat <<_ACEOF
1380		\`configure' configures protobuf-c 1.3.1 to adapt to many kinds of systems.
	1380	\`configure' configures protobuf-c 1.3.2 to adapt to many kinds of systems.
1381	1381
1382	1382	Usage: $0 [OPTION]... [VAR=VALUE]...
1383	1383

1448	1448
1449	1449	if test -n "$ac_init_help"; then
1450	1450	case $ac_init_help in
1451		short \| recursive ) echo "Configuration of protobuf-c 1.3.1:";;
	1451	short \| recursive ) echo "Configuration of protobuf-c 1.3.2:";;
1452	1452	esac
1453	1453	cat <<\_ACEOF
1454	1454

1581	1581	test -n "$ac_init_help" && exit $ac_status
1582	1582	if $ac_init_version; then
1583	1583	cat <<\_ACEOF
1584		protobuf-c configure 1.3.1
	1584	protobuf-c configure 1.3.2
1585	1585	generated by GNU Autoconf 2.69
1586	1586
1587	1587	Copyright (C) 2012 Free Software Foundation, Inc.

2204	2204	This file contains any messages produced by compilers while
2205	2205	running configure, to aid debugging if configure makes a mistake.
2206	2206
2207		It was created by protobuf-c $as_me 1.3.1, which was
	2207	It was created by protobuf-c $as_me 1.3.2, which was
2208	2208	generated by GNU Autoconf 2.69. Invocation command line was
2209	2209
2210	2210	$ $0 $@

3071	3071
3072	3072	# Define the identity of the package.
3073	3073	PACKAGE='protobuf-c'
3074		VERSION='1.3.1'
	3074	VERSION='1.3.2'
3075	3075
3076	3076
3077	3077	cat >>confdefs.h <<_ACEOF

7622	7622	test $ac_status = 0; }; then
7623	7623	# Now try to grab the symbols.
7624	7624	nlist=conftest.nm
7625		if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \\| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
7626		(eval $NM conftest.$ac_objext \\| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
7627		ac_status=$?
7628		$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7629		test $ac_status = 0; } && test -s "$nlist"; then
	7625	$ECHO "$as_me:$LINENO: $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe > $nlist" >&5
	7626	if eval "$NM" conftest.$ac_objext \\| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
7630	7627	# Try sorting and uniquifying the output.
7631	7628	if sort "$nlist" \| uniq > "$nlist"T; then
7632	7629	mv -f "$nlist"T "$nlist"

9717	9714	ecc*)
9718	9715	lt_prog_compiler_wl='-Wl,'
9719	9716	lt_prog_compiler_pic='-KPIC'
	9717	lt_prog_compiler_static='-static'
	9718	;;
	9719	# flang / f18. f95 an alias for gfortran or flang on Debian
	9720	flang* \| f18* \| f95*)
	9721	lt_prog_compiler_wl='-Wl,'
	9722	lt_prog_compiler_pic='-fPIC'
9720	9723	lt_prog_compiler_static='-static'
9721	9724	;;
9722	9725	# icc used to be incompatible with GCC.

13661	13664	# Commands to make compiler produce verbose output that lists
13662	13665	# what "hidden" libraries, object files and flags are used when
13663	13666	# linking a shared library.
13664		output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
	13667	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
13665	13668
13666	13669	else
13667	13670	GXX=no

14153	14156	# explicitly linking system object files so we need to strip them
14154	14157	# from the output so that they don't get included in the library
14155	14158	# dependencies.
14156		output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
	14159	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
14157	14160	;;
14158	14161	*)
14159	14162	if test yes = "$GXX"; then

14218	14221	# explicitly linking system object files so we need to strip them
14219	14222	# from the output so that they don't get included in the library
14220	14223	# dependencies.
14221		output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
	14224	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
14222	14225	;;
14223	14226	*)
14224	14227	if test yes = "$GXX"; then

14557	14560	# Commands to make compiler produce verbose output that lists
14558	14561	# what "hidden" libraries, object files and flags are used when
14559	14562	# linking a shared library.
14560		output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
	14563	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
14561	14564
14562	14565	else
14563	14566	# FIXME: insert proper C++ library support

14641	14644	# Commands to make compiler produce verbose output that lists
14642	14645	# what "hidden" libraries, object files and flags are used when
14643	14646	# linking a shared library.
14644		output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
	14647	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
14645	14648	else
14646	14649	# g++ 2.7 appears to require '-G' NOT '-shared' on this
14647	14650	# platform.

14652	14655	# Commands to make compiler produce verbose output that lists
14653	14656	# what "hidden" libraries, object files and flags are used when
14654	14657	# linking a shared library.
14655		output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
	14658	output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
14656	14659	fi
14657	14660
14658	14661	hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'

18855	18858	# report actual input values of CONFIG_FILES etc. instead of their
18856	18859	# values after options handling.
18857	18860	ac_log="
18858		This file was extended by protobuf-c $as_me 1.3.1, which was
	18861	This file was extended by protobuf-c $as_me 1.3.2, which was
18859	18862	generated by GNU Autoconf 2.69. Invocation command line was
18860	18863
18861	18864	CONFIG_FILES = $CONFIG_FILES

18922	18925	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
18923	18926	ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
18924	18927	ac_cs_version="\\
18925		protobuf-c config.status 1.3.1
	18928	protobuf-c config.status 1.3.2
18926	18929	configured by $0, generated by GNU Autoconf 2.69,
18927	18930	with options \\"\$ac_cs_config\\"
18928	18931

-1

configure.ac less more

0	0	AC_PREREQ(2.63)
1	1
2	2	AC_INIT([protobuf-c],
3		[1.3.1],
	3	[1.3.2],
4	4	[https://github.com/protobuf-c/protobuf-c/issues],
5	5	[protobuf-c],
6	6	[https://github.com/protobuf-c/protobuf-c])

+14

-7

m4/libtool.m4 less more

4062	4062	if AC_TRY_EVAL(ac_compile); then
4063	4063	# Now try to grab the symbols.
4064	4064	nlist=conftest.nm
4065		if AC_TRY_EVAL(NM conftest.$ac_objext \\| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
	4065	$ECHO "$as_me:$LINENO: $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
	4066	if eval "$NM" conftest.$ac_objext \\| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
4066	4067	# Try sorting and uniquifying the output.
4067	4068	if sort "$nlist" \| uniq > "$nlist"T; then
4068	4069	mv -f "$nlist"T "$nlist"

4702	4703	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4703	4704	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
4704	4705	;;
	4706	# flang / f18. f95 an alias for gfortran or flang on Debian
	4707	flang* \| f18* \| f95*)
	4708	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
	4709	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
	4710	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
	4711	;;
4705	4712	# icc used to be incompatible with GCC.
4706	4713	# ICC 10 doesn't accept -KPIC any more.
4707	4714	icc* \| ifort*)

6437	6444	# Commands to make compiler produce verbose output that lists
6438	6445	# what "hidden" libraries, object files and flags are used when
6439	6446	# linking a shared library.
6440		output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
	6447	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
6441	6448
6442	6449	else
6443	6450	GXX=no

6812	6819	# explicitly linking system object files so we need to strip them
6813	6820	# from the output so that they don't get included in the library
6814	6821	# dependencies.
6815		output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
	6822	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
6816	6823	;;
6817	6824	*)
6818	6825	if test yes = "$GXX"; then

6877	6884	# explicitly linking system object files so we need to strip them
6878	6885	# from the output so that they don't get included in the library
6879	6886	# dependencies.
6880		output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
	6887	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
6881	6888	;;
6882	6889	*)
6883	6890	if test yes = "$GXX"; then

7216	7223	# Commands to make compiler produce verbose output that lists
7217	7224	# what "hidden" libraries, object files and flags are used when
7218	7225	# linking a shared library.
7219		output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
	7226	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
7220	7227
7221	7228	else
7222	7229	# FIXME: insert proper C++ library support

7300	7307	# Commands to make compiler produce verbose output that lists
7301	7308	# what "hidden" libraries, object files and flags are used when
7302	7309	# linking a shared library.
7303		output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
	7310	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
7304	7311	else
7305	7312	# g++ 2.7 appears to require '-G' NOT '-shared' on this
7306	7313	# platform.

7311	7318	# Commands to make compiler produce verbose output that lists
7312	7319	# what "hidden" libraries, object files and flags are used when
7313	7320	# linking a shared library.
7314		output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
	7321	output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
7315	7322	fi
7316	7323
7317	7324	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'

+27

-7

protobuf-c/protobuf-c.c less more

2071	2071	unsigned shift = 4;
2072	2072	unsigned rv;
2073	2073
	2074	/* 0 is not a valid tag value */
	2075	if ((data[0] & 0xf8) == 0) {
	2076	return 0;
	2077	}
	2078
2074	2079	*wiretype_out = data[0] & 7;
2075	2080	if ((data[0] & 0x80) == 0) {
2076	2081	*tag_out = tag;

2102	2107	const uint8_t data; /< Pointer to field data. /
2103	2108	};
2104	2109
2105		static inline uint32_t
	2110	static inline size_t
2106	2111	scan_length_prefixed_data(size_t len, const uint8_t *data,
2107	2112	size_t *prefix_len_out)
2108	2113	{
2109	2114	unsigned hdr_max = len < 5 ? len : 5;
2110	2115	unsigned hdr_len;
2111		uint32_t val = 0;
	2116	size_t val = 0;
2112	2117	unsigned i;
2113	2118	unsigned shift = 0;
2114	2119
2115	2120	for (i = 0; i < hdr_max; i++) {
2116		val \|= (data[i] & 0x7f) << shift;
	2121	val \|= ((size_t)data[i] & 0x7f) << shift;
2117	2122	shift += 7;
2118	2123	if ((data[i] & 0x80) == 0)
2119	2124	break;

2124	2129	}
2125	2130	hdr_len = i + 1;
2126	2131	*prefix_len_out = hdr_len;
	2132	if (val > INT_MAX) {
	2133	// Protobuf messages should always be less than 2 GiB in size.
	2134	// We also want to return early here so that hdr_len + val does
	2135	// not overflow on 32-bit systems.
	2136	PROTOBUF_C_UNPACK_ERROR("length prefix of %lu is too large", val);
	2137	return 0;
	2138	}
2127	2139	if (hdr_len + val > len) {
2128		PROTOBUF_C_UNPACK_ERROR("data too short after length-prefix of %u", val);
	2140	PROTOBUF_C_UNPACK_ERROR("data too short after length-prefix of %lu", val);
2129	2141	return 0;
2130	2142	}
2131	2143	return hdr_len + val;

2628	2640
2629	2641	/* If we have already parsed a member of this oneof, free it. */
2630	2642	if (*oneof_case != 0) {
	2643	const ProtobufCFieldDescriptor *old_field;
	2644	size_t el_size;
2631	2645	/* lookup field */
2632	2646	int field_index =
2633	2647	int_range_lookup(message->descriptor->n_field_ranges,

2635	2649	*oneof_case);
2636	2650	if (field_index < 0)
2637	2651	return FALSE;
2638		const ProtobufCFieldDescriptor *old_field =
2639		message->descriptor->fields + field_index;
2640		size_t el_size = sizeof_elt_in_repeated_array(old_field->type);
	2652	old_field = message->descriptor->fields + field_index;
	2653	el_size = sizeof_elt_in_repeated_array(old_field->type);
2641	2654
2642	2655	switch (old_field->type) {
2643	2656	case PROTOBUF_C_TYPE_STRING: {

3414	3427	ProtobufCLabel label = f->label;
3415	3428	void *field = STRUCT_MEMBER_P (message, f->offset);
3416	3429
	3430	if (f->flags & PROTOBUF_C_FIELD_FLAG_ONEOF) {
	3431	const uint32_t *oneof_case = STRUCT_MEMBER_P (message, f->quantifier_offset);
	3432	if (f->id != *oneof_case) {
	3433	continue; //Do not check if it is an unpopulated oneof member.
	3434	}
	3435	}
	3436
3417	3437	if (label == PROTOBUF_C_LABEL_REPEATED) {
3418	3438	size_t *quantity = STRUCT_MEMBER_P (message, f->quantifier_offset);
3419	3439

-2

protobuf-c/protobuf-c.h less more

789	789	* The version of the protobuf-c headers, represented as a string using the same
790	790	* format as protobuf_c_version().
791	791	*/
792		#define PROTOBUF_C_VERSION "1.3.1"
	792	#define PROTOBUF_C_VERSION "1.3.2"
793	793
794	794	/**
795	795	* The version of the protobuf-c headers, represented as an integer using the
796	796	* same format as protobuf_c_version_number().
797	797	*/
798		#define PROTOBUF_C_VERSION_NUMBER 1003001
	798	#define PROTOBUF_C_VERSION_NUMBER 1003002
799	799
800	800	/**
801	801	* The minimum protoc-c version which works with the current version of the

-1

protoc-c/c_field.cc less more

139	139
140	140	if (descriptor_->label() == FieldDescriptor::LABEL_REPEATED
141	141	&& is_packable_type (descriptor_->type())
142		&& descriptor_->options().packed())
	142	&& descriptor_->options().packed()) {
143	143	variables["flags"] += " \| PROTOBUF_C_FIELD_FLAG_PACKED";
	144	} else if (descriptor_->label() == FieldDescriptor::LABEL_REPEATED
	145	&& is_packable_type (descriptor_->type())
	146	&& FieldSyntax(descriptor_) == 3
	147	&& !descriptor_->options().has_packed()) {
	148	variables["flags"] += " \| PROTOBUF_C_FIELD_FLAG_PACKED";
	149	}
144	150
145	151	if (descriptor_->options().deprecated())
146	152	variables["flags"] += " \| PROTOBUF_C_FIELD_FLAG_DEPRECATED";

-1

t/generated-code2/cxx-generate-packed-data.cc less more

997	997	static void dump_test_unknown_fields (void)
998	998	{
999	999	EmptyMess mess;
1000		const google::protobuf::Message::Reflection *reflection = mess.GetReflection();
	1000	const google::protobuf::Reflection *reflection = mess.GetReflection();
1001	1001	google::protobuf::UnknownFieldSet *fs = reflection->MutableUnknownFields(&mess);
1002	1002
1003	1003	#if GOOGLE_PROTOBUF_VERSION >= 2001000

+10

-0

t/generated-code2/test-generated-code2.c less more

963	963	DO_TEST (&submess, test_optional_submess_42);
964	964	#undef DO_TEST
965	965	}
	966
	967	static void test_oneof_message_check(void)
	968	{
	969	Foo__TestMessOneof msg = FOO__TEST_MESS_ONEOF__INIT;
	970	msg.test_oneof_case = FOO__TEST_MESS_ONEOF__TEST_ONEOF_TEST_STRING;
	971	msg.test_string = "Hello, world!";
	972	assert(protobuf_c_message_check((ProtobufCMessage *)&msg));
	973	}
	974
966	975	static void test_oneof_merge (void)
967	976	{
968	977	Foo__TestMessOneof *msg;

2259	2268	{ "test oneof string", test_oneof_string },
2260	2269	{ "test oneof bytes", test_oneof_bytes },
2261	2270	{ "test oneof SubMess", test_oneof_SubMess },
	2271	{ "test oneof message check", test_oneof_message_check },
2262	2272	{ "test merged oneof unpack", test_oneof_merge },
2263	2273
2264	2274	{ "test empty repeated" ,test_empty_repeated },

+25

-0

t/issue330/issue330.c less more

	0	#include <stdlib.h>
	1	#include <string.h>
	2
	3	#include "t/issue330/issue330.pb-c.h"
	4
	5	int main(void)
	6	{
	7	/* Output of $ echo acl_id: 2 acl_id: 3 \| protoc issue330.proto \
	8	* --encode=pbr_route \| xxd -i: 0x52, 0x02, 0x02, 0x03
	9	*/
	10	uint8_t protoc[] = {0x52, 0x02, 0x02, 0x03};
	11	PbrRoute msg = PBR_ROUTE__INIT;
	12	int ids[] = {2, 3};
	13	uint8_t buf[16] = {0};
	14	size_t sz = 0;
	15
	16	msg.n_acl_id = 2;
	17	msg.acl_id = ids;
	18	sz = pbr_route__pack(&msg, buf);
	19
	20	assert (sz == sizeof protoc);
	21	assert (memcmp (protoc, buf, sz) == 0);
	22
	23	return EXIT_SUCCESS;
	24	}

-0

t/issue330/issue330.proto less more

	0	syntax = "proto3";
	1
	2	message pbr_route {
	3	repeated int32 acl_id = 10;
	4	}

+24

-0

t/issue375/issue375.c less more

	0	#include <assert.h>
	1	#include <stdlib.h>
	2
	3	#include "t/issue375/issue375.pb-c.h"
	4
	5	int main(void) {
	6	// This buffer represents some serialized bytes where we have a length
	7	// delimiter of 2^32 - 1 bytes for a particular repeated int32 field.
	8	// We want to make sure that parsing a length delimiter this large does
	9	// not cause a problematic integer overflow.
	10	uint8_t buffer[] = {
	11	// Field 1 with wire type 2 (length-delimited)
	12	0x0a,
	13	// Varint length delimiter: 2^32 - 1
	14	0xff, 0xff, 0xff, 0xff, 0x0f,
	15	};
	16	// The parser should detect that this message is malformed and return
	17	// null.
	18	Issue375__TestMessage* m =
	19	issue375__test_message__unpack(NULL, sizeof(buffer), buffer);
	20	assert(m == NULL);
	21
	22	return EXIT_SUCCESS;
	23	}

-0

t/issue375/issue375.proto less more

	0	syntax = "proto2";
	1
	2	package issue375;
	3
	4	message TestMessage {
	5	repeated int32 nums = 1;
	6	}