683 Commits

Author SHA1 Message Date
Robert Edmonds
712154b912 Bump minimum required header version for proto3 syntax
The changes in #274 (proto3: make strings default to "" instead of NULL)
add a new symbol to the library and add an 'extern' declaration to the
protobuf-c header file.

Since the compiler may generate files that depend on that new
'protobuf_c_empty_string' declaration in protobuf-c.h, we need to bump
the min_header_version value that is written into generated header
files. But since the 'protobuf_c_empty_string' symbol can only be
referenced when generating proto3 syntax files, we only need to use the
stricter min_header_version value when processing a proto3 file.
2017-07-29 20:16:22 -04:00
Robert Edmonds
631dbd0db7 .gitignore: t/generated-code3/test-generated-code3 2017-07-29 19:44:07 -04:00
Robert Edmonds
aee115c92b Merge pull request #281 from protobuf-c/edmonds/version/1.3.0
Bump version to 1.3.0
2017-07-29 19:43:41 -04:00
Robert Edmonds
25cb6e2bdf Bump version to 1.3.0 2017-07-29 19:30:36 -04:00
Robert Edmonds
d7189b6940 Merge pull request #280 from protobuf-c/edmonds/fix-namespace-errors
Fix namespace errors when compiled with latest protobuf
2017-07-29 19:10:00 -04:00
Robert Edmonds
582cad8bff Fix namespace errors when compiled with latest protobuf
The protobuf project removed "using namespace std" namespace pollution
from their stubs/common.h header file. This caused build failures for us
since we relied on their namespace pollution.

This commit updates protobuf-c to convert:

 'map' → 'std::map'
 'set' → 'std::set'
 'back_insert_iterator' → 'std::back_insert_iterator'
2017-07-29 18:52:28 -04:00
Robert Edmonds
858ce990e8 Merge pull request #274 from pbor/wip/empty-string
proto3: make strings default to "" instead of NULL
2017-07-29 18:17:15 -04:00
Paolo Borelli
2a46af4278 proto3: make strings default to "" instead of NULL
The spec talks about "empty string" and other languages like C#
return a zero length string and not null.
This is useful because when moving from proto2's "required string"
to a proto3's plain string we will be guaranteed that we
never get a null pointer.
The tradeoff is adding a special case to the library but avoiding
a lot of null checks in the calling code.
The current code is already special casing "" in pack_string.
2017-06-12 09:32:39 +02:00
Robert Edmonds
a8921fe7dc Merge pull request #267 from pbor/wip/zeroish
Rework is_zeroish one more time
2017-04-10 08:40:51 -07:00
Robert Edmonds
5464067168 Merge pull request #266 from alex85k/next
Update CMakeLists.txt
2017-04-10 08:27:05 -07:00
Paolo Borelli
4ca344ed9f Rework is_zeroish one more time
The "member" param cannot be NULL, so last patch was not correct.
However to be valgrind clean we need to cast to the right size.
2017-04-10 17:21:25 +02:00
alex85k
58a4514164 fixing tests building in CMake 2017-04-10 18:42:59 +05:00
Robert Edmonds
0014b7c046 Merge pull request #265 from pbor/wip/cleanup
Small cleanup in oneof handling
2017-04-09 09:44:46 -07:00
Robert Edmonds
448dba28d9 Merge pull request #264 from pbor/wip/zeroish
Fix proto3 "is zeroish" evaluation
2017-04-09 09:44:35 -07:00
Paolo Borelli
6bbcc433d5 Cleanup oneof handling
Small cleanups: pass the oneof case param by value instead of by
reference and use an early return if the case does not match.
2017-04-09 14:36:49 +02:00
Paolo Borelli
13b6e1fd00 Improve proto3 unit test
Make sure we actually include the proto3 generated header and
test nested submessages
2017-04-09 10:54:58 +02:00
Paolo Borelli
1c8805a780 Fix "is zeroish" evaluation for proto3
In proto3 the default value is zero (NULL for pointers and 0 for
scalars). However when checking we still need to test by type
because poinetr types have an extra indirection.
2017-04-09 10:54:34 +02:00
Robert Edmonds
39967de734 Merge pull request #258 from pbor/fixup
Remove leftover FIXME comment
2017-02-27 14:26:20 -08:00
Paolo Borelli
7c114269d7 Remove leftover FIXME comment 2017-02-26 10:39:35 +01:00
Robert Edmonds
56f4709945 Merge pull request #257 from protobuf-c/edmonds/strict-warnings
Add warning flags to my_CFLAGS
2017-02-25 15:33:11 -08:00
Robert Edmonds
c5c236b42e protobuf_c_message_unpack(): Remove a shadowed variable
Here 'j' is used as a loop index and there's no need to re-declare it
inside this block.

Found with -Wshadow.
2017-02-25 18:18:49 -05:00
Robert Edmonds
6eb0b271ae configure.ac: Add warning flags to my_CFLAGS 2017-02-25 18:18:12 -05:00
Robert Edmonds
1b71214c02 m4/ax_check_compile_flag.m4: Import from autoconf-archive (serial 5) 2017-02-25 17:31:13 -05:00
Robert Edmonds
bd32c297c5 Merge pull request #245 from Qix-/patch-1
CMAKE_SOURCE_DIR -> CMAKE_CURRENT_SOURCE_DIR
2017-02-25 14:26:07 -08:00
Robert Edmonds
6627548a93 Merge pull request #243 from cam029/next
Static build for Windows MSVC
2017-02-25 14:25:49 -08:00
Robert Edmonds
9aa47285b0 protobuf-c.h: Fix typo " " -> " " 2017-02-25 17:21:01 -05:00
Robert Edmonds
c48d932003 Merge pull request #228 from pbor/wip/proto3
proto3 support
2017-02-25 14:20:04 -08:00
Robert Edmonds
0973be46d2 Merge pull request #256 from protobuf-c/issue/251
Fix "Bad enums with multiple oneofs" (#251)
2017-02-25 13:03:16 -08:00
Robert Edmonds
1442642234 t/issue251/: Add test case for #251 2017-02-25 15:52:39 -05:00
Robert Edmonds
638c54d4db GenerateStructDefinition(): Reset vars["opt_comma"] when processing multiple oneofs
This commit fixes #251, which causes incorrect code to be generated when
there are multiple oneofs in the same message.

In #221, we added code to force int-sizing for oneof enums, but we only
set vars["opt_comma"] initially, before entering the loop over the
message's oneofs. This caused commas to be omitted when generating the
enums for subsequent oneofs after the first oneof.

This commit resets vars["opt_comma"] every time through the loop that
generates the enum declarations for the message's oneofs.
2017-02-25 15:52:39 -05:00
Robert Edmonds
956ea86712 GenerateStructDefinition(): Append oneof name when forcing enums to be int size
This commit fixes a problem identified in #251. When generating the
PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE directive at the end of the enum
values generated for a oneof, we inadvertently only included the
protobuf class name in the call to the directive. This breaks if there
is more than one oneof per protobuf class, which causes duplicate enum
names to be generated.

This issue is fixed by also appending the oneof's name to the protobuf
class name when generating the PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE
directive, which should cause unique enum names to be generated.

This changes the enum name that is generated, but these names are
implementation details since they are sentinel values that only exist to
force the compiler to size the enum type correctly.

(The test case for #220 is updated since that test relies on the
oneof implementation details in the code generator.)
2017-02-25 15:52:39 -05:00
Robert Edmonds
424c498728 Merge pull request #255 from ewxrjk/free-null
Document and extend the effect of passing NULL to ..._free_unpacked functions
2017-02-25 12:49:38 -08:00
Richard Kettlewell
c23065e4b1 Allowing <type>__free_unpacked(NULL, ...)
This makes __free_unpacked() consistent with free(), and simplifies
callers by allowing them to indiscriminately free message objects
without regard to whether they have been allocated or not.
2017-02-25 19:59:17 +00:00
Richard Kettlewell
f06a172a91 Document that protobuf_c_message_free_unpacked(NULL, ...) is allowed 2017-02-25 19:59:17 +00:00
Robert Edmonds
581e2cb1bf Merge pull request #254 from protobuf-c/test/220
Add test case for #220
2017-02-25 11:56:30 -08:00
Robert Edmonds
d89895de3c t/issue220/: Add test case for #220 2017-02-25 14:49:09 -05:00
Josh
cfbe34f6f4 CMAKE_SOURCE_DIR -> CMAKE_CURRENT_SOURCE_DIR
This tells CMake to refer to the currently executed `CMakeLists.txt`'s directory instead of the root project directory. This allows protobuf-c to be included as a subdirectory (via `include_subdirectory`) while being innocuous for those that build protobuf-c by itself.
2016-12-04 18:48:47 -08:00
AlexMilich
0656a9ac35 Static build for Windows MSVC 2016-11-27 12:39:37 +02:00
Paolo Borelli
29b25869fa bump protobuf version in travis to 3.0.2
protobuf does not provide configured tarballs anymore, so we need
to run autogen.sh ourselves.
2016-10-30 11:20:47 +01:00
Paolo Borelli
2f22519f58 Add basic proto3 test
Same code of the proto2 test but with the corresponding proto3 file
2016-10-30 10:06:52 +01:00
Paolo Borelli
8194f4d91a proto3 support
This is a first cut at adding proto3 support.

As far as I understand protobuf-c already has pretty much everything
needed once it is built using a new version of protobuf itself.
The only missing thing is that in proto3 all fields are optional and
having to manually set has_foo is inconvenient.

This patch special cases the proto3 syntax files so that structs for the
bytes, enum and primitive fields do not emit the has_ field.

It also adds PROTOBUF_C_LABEL_NONE to the label enum that is used for
proto3 fields. When a fields has this label, the quantifier is not
consulted and instead the field is packed/unpacked depending on
whether it has a value different from NULL/0.
2016-10-30 10:06:52 +01:00
Robert Edmonds
9c4c8f6366 Merge pull request #236 from tkoecker/const_init_value
Make init_value const
2016-09-07 12:20:39 -07:00
Robert Edmonds
d5e1b3843e Merge pull request #234 from tkoecker/solaris_rm_args
rm argument fix for solaris
2016-09-07 12:19:09 -07:00
Robert Edmonds
fcb1bdd25c Merge pull request #233 from ben-farnham/change_configure_to_work_with_autom4te_v2_63
Relax autoconf constraint from v2.64 -> v2.63 (so that it works on SL6)
2016-09-07 12:17:58 -07:00
Thomas Köckerbauer
f73cc06d1e make init_value const 2016-09-07 15:18:41 +02:00
Thomas Köckerbauer
3ddc7c62ca rm argument fix for solaris 2016-09-07 10:33:38 +02:00
Ben Farnham
d0b0dbaeeb relax constraint slightly from v2.64 -> v2.63 (so that it works on scientific linux 6) 2016-09-07 09:07:12 +02:00
Robert Edmonds
d6ede8125e Merge pull request #232 from gdetal/master
protobuf-c: fix: make dist
2016-08-24 20:20:50 -07:00
Robert Edmonds
6503d2fb0f Merge pull request #231 from udnaan/next
fixed cmake build if built as  part of an external project
2016-08-24 20:18:13 -07:00
Gregory Detal
5306fc9329 protobuf-c: fix: make dist
remove .pb.{cc,h} in distdir instead of top_distdir in order to
prevent removing files from other projects when protobuf-c is
included as an autotools subproject.

Signed-off-by: Gregory Detal <gregory.detal@tessares.net>
2016-08-24 14:38:49 +02:00