Hello community,
here is the log from the commit of package protobuf-c for openSUSE:Factory
checked in at 2015-06-10 09:12:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/protobuf-c (Old)
and /work/SRC/openSUSE:Factory/.protobuf-c.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "protobuf-c"
Changes:
--------
--- /work/SRC/openSUSE:Factory/protobuf-c/protobuf-c.changes 2015-03-30
19:31:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.protobuf-c.new/protobuf-c.changes
2015-06-10 09:12:59.000000000 +0200
@@ -1,0 +2,27 @@
+Tue May 26 11:13:22 UTC 2015 - dg...@suse.com
+
+- Replaced autogen.sh in spec file with autoreconf -fvi
+
+-------------------------------------------------------------------
+Tue Apr 7 06:29:51 UTC 2015 - meiss...@suse.com
+
+- Update to version 1.1.1:
+ [ Ilya Lipnitskiy ]
+ * Munge C block comment delimiters in protobuf comments, preventing syntax
+ errors in generated header files (Issue #180, #185).
+
+ * Add static qualifier to ProtobufCEnumValue and ProtobufCEnumValueIndex
+ variables in generated output.
+
+ [ Oleg Efimov ]
+ * Fix -Wpointer-sign compiler diagnostics in the test suite.
+
+ * Check for NULL pointers in protobuf_c_message_free_unpacked() (Issue #177).
+
+ * Exclude protoc-c and downloaded protobuf sources from Coveralls report.
+
+ [ Andrey Myznikov ]
+ * Fix incorrect 'short_name' field values in ProtobufCServiceDescriptor
+ variables in generated output.
+
+-------------------------------------------------------------------
Old:
----
protobuf-c-1.1.0.tar.gz
New:
----
protobuf-c-1.1.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ protobuf-c.spec ++++++
--- /var/tmp/diff_new_pack.J3FJ13/_old 2015-06-10 09:13:00.000000000 +0200
+++ /var/tmp/diff_new_pack.J3FJ13/_new 2015-06-10 09:13:00.000000000 +0200
@@ -18,7 +18,7 @@
Name: protobuf-c
-Version: 1.1.0
+Version: 1.1.1
Release: 0
%define soname 1
Summary: C bindings for Google's Protocol Buffers
@@ -81,6 +81,7 @@
%__make %{?_smp_flags}
popd #build
%else
+autoreconf -fvi
%configure
%__make %{?_smp_flags}
%endif
@@ -93,17 +94,12 @@
%else
%makeinstall
%endif
-
%__rm "%{buildroot}%{_libdir}"/*.a
%__rm "%{buildroot}%{_libdir}"/*.la
%post -n libprotobuf-c%{soname} -p /sbin/ldconfig
-
%postun -n libprotobuf-c%{soname} -p /sbin/ldconfig
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
-
%files
%defattr(-,root,root)
%doc ChangeLog TODO
++++++ protobuf-c-1.1.0.tar.gz -> protobuf-c-1.1.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-c-1.1.0/ChangeLog
new/protobuf-c-1.1.1/ChangeLog
--- old/protobuf-c-1.1.0/ChangeLog 2015-01-05 22:41:55.000000000 +0100
+++ new/protobuf-c-1.1.1/ChangeLog 2015-03-14 22:00:57.000000000 +0100
@@ -1,3 +1,29 @@
+protobuf-c (1.1.1)
+
+ [ Robert Edmonds ]
+ * Release 1.1.1.
+
+ * Use protobuf 2.6.1 in the Travis-CI environment.
+
+ [ Ilya Lipnitskiy ]
+ * Munge C block comment delimiters in protobuf comments, preventing syntax
+ errors in generated header files (Issue #180, #185).
+
+ * Add static qualifier to ProtobufCEnumValue and ProtobufCEnumValueIndex
+ variables in generated output.
+
+ [ Oleg Efimov ]
+ * Fix -Wpointer-sign compiler diagnostics in the test suite.
+
+ * Check for NULL pointers in protobuf_c_message_free_unpacked()
+ (Issue #177).
+
+ * Exclude protoc-c and downloaded protobuf sources from Coveralls report.
+
+ [ Andrey Myznikov ]
+ * Fix incorrect 'short_name' field values in ProtobufCServiceDescriptor
+ variables in generated output.
+
protobuf-c (1.1.0)
[ Robert Edmonds ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-c-1.1.0/LICENSE new/protobuf-c-1.1.1/LICENSE
--- old/protobuf-c-1.1.0/LICENSE 2015-01-05 22:41:55.000000000 +0100
+++ new/protobuf-c-1.1.1/LICENSE 2015-03-14 22:00:57.000000000 +0100
@@ -1,4 +1,4 @@
-Copyright (c) 2008-2014, Dave Benson and the protobuf-c authors.
+Copyright (c) 2008-2015, Dave Benson and the protobuf-c authors.
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-c-1.1.0/Makefile.in
new/protobuf-c-1.1.1/Makefile.in
--- old/protobuf-c-1.1.0/Makefile.in 2015-01-05 22:42:42.000000000 +0100
+++ new/protobuf-c-1.1.1/Makefile.in 2015-03-14 22:01:49.000000000 +0100
@@ -1898,8 +1898,8 @@
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-@HAVE_DOXYGEN_FALSE@html-local:
@HAVE_DOXYGEN_FALSE@clean-local:
+@HAVE_DOXYGEN_FALSE@html-local:
clean: clean-am
clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-c-1.1.0/TODO new/protobuf-c-1.1.1/TODO
--- old/protobuf-c-1.1.0/TODO 2015-01-05 22:41:55.000000000 +0100
+++ new/protobuf-c-1.1.1/TODO 2015-03-13 17:41:18.000000000 +0100
@@ -1,11 +1,6 @@
----------------------
--- IMPORTANT TODO ---
----------------------
-- ensure enums are int-size
-- per comments on the main page: wire_format_inl.h is now
- wire_format_lite_inl.h .. adjust somehow .. possibly write an email
-- BUG? shouldn't enum..by_name[] and enum..by_number[] in the generated-code
- be static??
--------------------
--- NEEDED TESTS ---
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-c-1.1.0/aclocal.m4
new/protobuf-c-1.1.1/aclocal.m4
--- old/protobuf-c-1.1.0/aclocal.m4 2015-01-05 22:42:40.000000000 +0100
+++ new/protobuf-c-1.1.1/aclocal.m4 2015-03-14 22:01:48.000000000 +0100
@@ -103,9 +103,10 @@
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
])
# AM_COND_IF -*- Autoconf -*-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-c-1.1.0/build-aux/config.sub
new/protobuf-c-1.1.1/build-aux/config.sub
--- old/protobuf-c-1.1.0/build-aux/config.sub 2015-01-05 22:42:41.000000000
+0100
+++ new/protobuf-c-1.1.1/build-aux/config.sub 2015-03-14 22:01:49.000000000
+0100
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2014-09-11'
+timestamp='2014-05-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -302,7 +302,6 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
- | riscv32 | riscv64 \
| rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb |
shbe | shle | sh[1234]le | sh3ele \
@@ -829,10 +828,6 @@
basic_machine=powerpc-unknown
os=-morphos
;;
- moxiebox)
- basic_machine=moxie-unknown
- os=-moxiebox
- ;;
msdos)
basic_machine=i386-pc
os=-msdos
@@ -1378,7 +1373,7 @@
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems*
\
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-c-1.1.0/build-aux/ltmain.sh
new/protobuf-c-1.1.1/build-aux/ltmain.sh
--- old/protobuf-c-1.1.0/build-aux/ltmain.sh 2015-01-05 22:42:39.000000000
+0100
+++ new/protobuf-c-1.1.1/build-aux/ltmain.sh 2015-03-14 22:01:45.000000000
+0100
@@ -70,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.11
+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.10
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -80,7 +80,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.11"
+VERSION="2.4.2 Debian-2.4.2-1.10"
TIMESTAMP=""
package_revision=1.3337
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-c-1.1.0/build-cmake/CMakeLists.txt
new/protobuf-c-1.1.1/build-cmake/CMakeLists.txt
--- old/protobuf-c-1.1.0/build-cmake/CMakeLists.txt 2015-01-05
22:41:55.000000000 +0100
+++ new/protobuf-c-1.1.1/build-cmake/CMakeLists.txt 2015-03-14
22:00:57.000000000 +0100
@@ -1,6 +1,6 @@
SET(PACKAGE protobuf-c)
SET(PACKAGE_NAME protobuf-c)
-SET(PACKAGE_VERSION 1.1.0)
+SET(PACKAGE_VERSION 1.1.1)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-c-1.1.0/configure
new/protobuf-c-1.1.1/configure
--- old/protobuf-c-1.1.0/configure 2015-01-05 22:42:41.000000000 +0100
+++ new/protobuf-c-1.1.1/configure 2015-03-14 22:01:48.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for protobuf-c 1.1.0.
+# Generated by GNU Autoconf 2.69 for protobuf-c 1.1.1.
#
# Report bugs to <https://github.com/protobuf-c/protobuf-c/issues>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='protobuf-c'
PACKAGE_TARNAME='protobuf-c'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='protobuf-c 1.1.0'
+PACKAGE_VERSION='1.1.1'
+PACKAGE_STRING='protobuf-c 1.1.1'
PACKAGE_BUGREPORT='https://github.com/protobuf-c/protobuf-c/issues'
PACKAGE_URL='https://github.com/protobuf-c/protobuf-c'
@@ -1358,7 +1358,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures protobuf-c 1.1.0 to adapt to many kinds of systems.
+\`configure' configures protobuf-c 1.1.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1428,7 +1428,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of protobuf-c 1.1.0:";;
+ short | recursive ) echo "Configuration of protobuf-c 1.1.1:";;
esac
cat <<\_ACEOF
@@ -1556,7 +1556,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-protobuf-c configure 1.1.0
+protobuf-c configure 1.1.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2179,7 +2179,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by protobuf-c $as_me 1.1.0, which was
+It was created by protobuf-c $as_me 1.1.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2732,8 +2732,8 @@
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -3046,7 +3046,7 @@
# Define the identity of the package.
PACKAGE='protobuf-c'
- VERSION='1.1.0'
+ VERSION='1.1.1'
cat >>confdefs.h <<_ACEOF
@@ -17489,7 +17489,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by protobuf-c $as_me 1.1.0, which was
+This file was extended by protobuf-c $as_me 1.1.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17556,7 +17556,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-protobuf-c config.status 1.1.0
+protobuf-c config.status 1.1.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-c-1.1.0/configure.ac
new/protobuf-c-1.1.1/configure.ac
--- old/protobuf-c-1.1.0/configure.ac 2015-01-05 22:41:55.000000000 +0100
+++ new/protobuf-c-1.1.1/configure.ac 2015-03-14 22:00:57.000000000 +0100
@@ -1,7 +1,7 @@
AC_PREREQ(2.64)
AC_INIT([protobuf-c],
- [1.1.0],
+ [1.1.1],
[https://github.com/protobuf-c/protobuf-c/issues],
[protobuf-c],
[https://github.com/protobuf-c/protobuf-c])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-c-1.1.0/protobuf-c/protobuf-c.c
new/protobuf-c-1.1.1/protobuf-c/protobuf-c.c
--- old/protobuf-c-1.1.0/protobuf-c/protobuf-c.c 2015-01-05
22:41:55.000000000 +0100
+++ new/protobuf-c-1.1.1/protobuf-c/protobuf-c.c 2015-03-14
22:00:57.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2014, Dave Benson and the protobuf-c authors.
+ * Copyright (c) 2008-2015, Dave Benson and the protobuf-c authors.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -3158,10 +3158,14 @@
protobuf_c_message_free_unpacked(ProtobufCMessage *message,
ProtobufCAllocator *allocator)
{
+ if (message == NULL)
+ return;
+
const ProtobufCMessageDescriptor *desc = message->descriptor;
unsigned f;
ASSERT_IS_MESSAGE(message);
+
if (allocator == NULL)
allocator = &protobuf_c__allocator;
message->descriptor = NULL;
@@ -3182,24 +3186,25 @@
message,
desc->fields[f].offset);
- if (desc->fields[f].type == PROTOBUF_C_TYPE_STRING) {
- unsigned i;
- for (i = 0; i < n; i++)
- do_free(allocator, ((char **) arr)[i]);
- } else if (desc->fields[f].type ==
PROTOBUF_C_TYPE_BYTES) {
- unsigned i;
- for (i = 0; i < n; i++)
- do_free(allocator,
((ProtobufCBinaryData *) arr)[i].data);
- } else if (desc->fields[f].type ==
PROTOBUF_C_TYPE_MESSAGE) {
- unsigned i;
- for (i = 0; i < n; i++)
- protobuf_c_message_free_unpacked(
- ((ProtobufCMessage **) arr)[i],
- allocator
- );
- }
- if (arr != NULL)
+ if (arr != NULL) {
+ if (desc->fields[f].type ==
PROTOBUF_C_TYPE_STRING) {
+ unsigned i;
+ for (i = 0; i < n; i++)
+ do_free(allocator, ((char **)
arr)[i]);
+ } else if (desc->fields[f].type ==
PROTOBUF_C_TYPE_BYTES) {
+ unsigned i;
+ for (i = 0; i < n; i++)
+ do_free(allocator,
((ProtobufCBinaryData *) arr)[i].data);
+ } else if (desc->fields[f].type ==
PROTOBUF_C_TYPE_MESSAGE) {
+ unsigned i;
+ for (i = 0; i < n; i++)
+
protobuf_c_message_free_unpacked(
+ ((ProtobufCMessage **)
arr)[i],
+ allocator
+ );
+ }
do_free(allocator, arr);
+ }
} else if (desc->fields[f].type == PROTOBUF_C_TYPE_STRING) {
char *str = STRUCT_MEMBER(char *, message,
desc->fields[f].offset);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-c-1.1.0/protobuf-c/protobuf-c.h
new/protobuf-c-1.1.1/protobuf-c/protobuf-c.h
--- old/protobuf-c-1.1.0/protobuf-c/protobuf-c.h 2015-01-05
22:41:55.000000000 +0100
+++ new/protobuf-c-1.1.1/protobuf-c/protobuf-c.h 2015-03-14
22:00:57.000000000 +0100
@@ -781,13 +781,13 @@
* The version of the protobuf-c headers, represented as a string using the
same
* format as protobuf_c_version().
*/
-#define PROTOBUF_C_VERSION "1.1.0"
+#define PROTOBUF_C_VERSION "1.1.1"
/**
* The version of the protobuf-c headers, represented as an integer using the
* same format as protobuf_c_version_number().
*/
-#define PROTOBUF_C_VERSION_NUMBER 1001000
+#define PROTOBUF_C_VERSION_NUMBER 1001001
/**
* The minimum protoc-c version which works with the current version of the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-c-1.1.0/protoc-c/c_enum.cc
new/protobuf-c-1.1.1/protoc-c/c_enum.cc
--- old/protobuf-c-1.1.0/protoc-c/c_enum.cc 2015-01-05 22:41:55.000000000
+0100
+++ new/protobuf-c-1.1.1/protoc-c/c_enum.cc 2015-03-13 17:41:18.000000000
+0100
@@ -216,7 +216,7 @@
vars["unique_value_count"] = SimpleItoa(n_unique_values);
printer->Print(vars,
- "const ProtobufCEnumValue
$lcclassname$__enum_values_by_number[$unique_value_count$] =\n"
+ "static const ProtobufCEnumValue
$lcclassname$__enum_values_by_number[$unique_value_count$] =\n"
"{\n");
if (descriptor_->value_count() > 0) {
GenerateValueInitializer(printer, value_index[0].index);
@@ -269,7 +269,7 @@
qsort(value_index, descriptor_->value_count(),
sizeof(ValueIndex), compare_value_indices_by_name);
printer->Print(vars,
- "const ProtobufCEnumValueIndex
$lcclassname$__enum_values_by_name[$value_count$] =\n"
+ "static const ProtobufCEnumValueIndex
$lcclassname$__enum_values_by_name[$value_count$] =\n"
"{\n");
for (int j = 0; j < descriptor_->value_count(); j++) {
vars["index"] = SimpleItoa(value_index[j].final_index);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-c-1.1.0/protoc-c/c_helpers.cc
new/protobuf-c-1.1.1/protoc-c/c_helpers.cc
--- old/protobuf-c-1.1.0/protoc-c/c_helpers.cc 2015-01-05 22:41:55.000000000
+0100
+++ new/protobuf-c-1.1.1/protoc-c/c_helpers.cc 2015-03-13 17:42:51.000000000
+0100
@@ -225,6 +225,14 @@
if (comment_lines[i][0] == '/')
comment_lines[i] = ' ' + comment_lines[i];
+ /* Or cause other compiler issues. */
+ size_t delim_i;
+ while ((delim_i = comment_lines[i].find("/*")) != string::npos)
+ comment_lines[i][delim_i] = ' ';
+
+ while ((delim_i = comment_lines[i].find("*/")) != string::npos)
+ comment_lines[i][delim_i + 1] = ' ';
+
printer->Print (" *$line$\n", "line", comment_lines[i]);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-c-1.1.0/protoc-c/c_service.cc
new/protobuf-c-1.1.1/protoc-c/c_service.cc
--- old/protobuf-c-1.1.0/protoc-c/c_service.cc 2015-01-05 22:41:55.000000000
+0100
+++ new/protobuf-c-1.1.1/protoc-c/c_service.cc 2015-03-14 21:00:28.000000000
+0100
@@ -197,7 +197,7 @@
{
int n_methods = descriptor_->method_count();
MethodIndexAndName *mi_array = new MethodIndexAndName[n_methods];
-
+
vars_["n_methods"] = SimpleItoa(n_methods);
printer->Print(vars_, "static const ProtobufCMethodDescriptor
$lcfullname$__method_descriptors[$n_methods$] =\n"
"{\n");
@@ -224,6 +224,8 @@
}
printer->Print(vars_, "};\n");
+ vars_["name"] = descriptor_->name();
+
printer->Print(vars_, "const ProtobufCServiceDescriptor
$lcfullname$__descriptor =\n"
"{\n"
" PROTOBUF_C__SERVICE_DESCRIPTOR_MAGIC,\n"
@@ -251,7 +253,7 @@
vars_["output_typename"] = FullNameToC(method->output_type()->full_name());
vars_["padddddddddddddddddd"] = ConvertToSpaces(lcfullname + "__" +
lcname);
vars_["index"] = SimpleItoa(i);
-
+
printer->Print(vars_,
"void $lcfullname$__$method$(ProtobufCService *service,\n"
" $padddddddddddddddddd$ const $input_typename$
*input,\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/protobuf-c-1.1.0/t/generated-code2/test-generated-code2.c
new/protobuf-c-1.1.1/t/generated-code2/test-generated-code2.c
--- old/protobuf-c-1.1.0/t/generated-code2/test-generated-code2.c
2015-01-05 22:41:55.000000000 +0100
+++ new/protobuf-c-1.1.1/t/generated-code2/test-generated-code2.c
2015-03-13 17:41:18.000000000 +0100
@@ -1925,6 +1925,30 @@
free (packed);
}
+static void
+test_free_unpacked_input_check_for_null_message (void)
+{
+ protobuf_c_message_free_unpacked (NULL, NULL);
+}
+
+static void
+test_free_unpacked_input_check_for_null_repeated_field (void)
+{
+ Foo__TestMess *tm = calloc(1, foo__test_mess__descriptor.sizeof_message);
+ foo__test_mess__init(tm);
+
+ tm->n_test_string = 1;
+ tm->test_string = NULL;
+
+ tm->n_test_bytes = 1;
+ tm->test_bytes = NULL;
+
+ tm->n_test_message = 1;
+ tm->test_message = NULL;
+
+ foo__test_mess__free_unpacked (tm, NULL);
+}
+
/* This test checks that protobuf decoder is capable of detecting special
cases of incomplete messages. The message should have at least two required
fields field1 and field129 with positions pos1 and pos2 (no matter what the
@@ -1946,33 +1970,29 @@
test_field_flags (void)
{
const ProtobufCFieldDescriptor *f;
+ const ProtobufCMessageDescriptor *desc = &foo__test_field_flags__descriptor;
- f = protobuf_c_message_descriptor_get_field_by_name(
- &foo__test_field_flags__descriptor, "no_flags1");
+ f = protobuf_c_message_descriptor_get_field_by_name(desc, "no_flags1");
assert(f != NULL);
assert(!(f->flags & PROTOBUF_C_FIELD_FLAG_PACKED));
assert(!(f->flags & PROTOBUF_C_FIELD_FLAG_DEPRECATED));
- f = protobuf_c_message_descriptor_get_field_by_name(
- &foo__test_field_flags__descriptor, "no_flags2");
+ f = protobuf_c_message_descriptor_get_field_by_name(desc, "no_flags2");
assert(f != NULL);
assert(!(f->flags & PROTOBUF_C_FIELD_FLAG_PACKED));
assert(!(f->flags & PROTOBUF_C_FIELD_FLAG_DEPRECATED));
- f = protobuf_c_message_descriptor_get_field_by_name(
- &foo__test_field_flags__descriptor, "no_flags3");
+ f = protobuf_c_message_descriptor_get_field_by_name(desc, "no_flags3");
assert(f != NULL);
assert(!(f->flags & PROTOBUF_C_FIELD_FLAG_PACKED));
assert(!(f->flags & PROTOBUF_C_FIELD_FLAG_DEPRECATED));
- f = protobuf_c_message_descriptor_get_field_by_name(
- &foo__test_field_flags__descriptor, "packed");
+ f = protobuf_c_message_descriptor_get_field_by_name(desc, "packed");
assert(f != NULL);
assert((f->flags & PROTOBUF_C_FIELD_FLAG_PACKED));
assert(!(f->flags & PROTOBUF_C_FIELD_FLAG_DEPRECATED));
- f = protobuf_c_message_descriptor_get_field_by_name(
- &foo__test_field_flags__descriptor, "packed_deprecated");
+ f = protobuf_c_message_descriptor_get_field_by_name(desc,
"packed_deprecated");
assert(f != NULL);
assert((f->flags & PROTOBUF_C_FIELD_FLAG_PACKED));
assert((f->flags & PROTOBUF_C_FIELD_FLAG_DEPRECATED));
@@ -2002,7 +2022,7 @@
/* test with required_string not set */
m.required_string = NULL;
m.required_msg = &sm;
- m.required_bytes.data = str; m.required_bytes.len = 1;
+ m.required_bytes.data = (uint8_t *)str; m.required_bytes.len = 1;
assert(0 == protobuf_c_message_check(&m.base));
/* test with required_msg not set */
@@ -2016,7 +2036,7 @@
assert(0 == protobuf_c_message_check(&m.base));
/* test with all required fields set */
- m.required_bytes.data = str; m.required_bytes.len = 1;
+ m.required_bytes.data = (uint8_t *)str; m.required_bytes.len = 1;
assert(1 == protobuf_c_message_check(&m.base));
/* test with incomplete required submessage */
@@ -2041,7 +2061,7 @@
assert(0 == protobuf_c_message_check(&m.base));
/* test with correct optional bytes */
- m.optional_bytes.data = str; m.optional_bytes.len = 1;
+ m.optional_bytes.data = (uint8_t *)str; m.optional_bytes.len = 1;
assert(1 == protobuf_c_message_check(&m.base));
/* test with repeated strings set incorrectly */
@@ -2076,7 +2096,7 @@
assert(0 == protobuf_c_message_check(&m.base));
/* test with repeated bytes set correctly */
- bd.data = str;
+ bd.data = (uint8_t *)str;
assert(1 == protobuf_c_message_check(&m.base));
/* test with empty repeated string vector */
@@ -2225,6 +2245,9 @@
{ "test free unpacked", test_alloc_free_all },
{ "test alloc failure", test_alloc_fail },
+ { "test free unpacked input check for null message",
test_free_unpacked_input_check_for_null_message },
+ { "test free unpacked input check for null repeated field",
test_free_unpacked_input_check_for_null_repeated_field },
+
{ "test required_fields_bitmap", test_required_fields_bitmap },
{ "test field flags", test_field_flags },
