Skip to content

Instantly share code, notes, and snippets.

@mfournier

mfournier/gist:5355786

Created April 10, 2013 15:44
Show Gist options
  • Save mfournier/5355786 to your computer and use it in GitHub Desktop.
Save mfournier/5355786 to your computer and use it in GitHub Desktop.
Download ZIP
collectd/src/*.pb-c.[c,h], diff between protobuf-c 0.12 and 0.15
Raw
gistfile1.diff
diff -ru /tmp/pb-c-0.12/pinba.pb-c.c /tmp/pb-c-0.15/pinba.pb-c.c
--- /tmp/pb-c-0.12/pinba.pb-c.c 2013-04-10 17:41:05.434000580 +0200
+++ /tmp/pb-c-0.15/pinba.pb-c.c 2013-04-10 17:42:07.270012460 +0200
@@ -1,5 +1,10 @@
/* Generated by the protocol buffer compiler. DO NOT EDIT! */
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C_NO_DEPRECATED
+#define PROTOBUF_C_NO_DEPRECATED
+#endif
+
#include "pinba.pb-c.h"
void pinba__request__init
(Pinba__Request *message)
@@ -55,7 +60,8 @@
PROTOBUF_C_OFFSETOF(Pinba__Request, hostname),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"server_name",
@@ -66,7 +72,8 @@
PROTOBUF_C_OFFSETOF(Pinba__Request, server_name),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"script_name",
@@ -77,7 +84,8 @@
PROTOBUF_C_OFFSETOF(Pinba__Request, script_name),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"request_count",
@@ -88,7 +96,8 @@
PROTOBUF_C_OFFSETOF(Pinba__Request, request_count),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"document_size",
@@ -99,7 +108,8 @@
PROTOBUF_C_OFFSETOF(Pinba__Request, document_size),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"memory_peak",
@@ -110,7 +120,8 @@
PROTOBUF_C_OFFSETOF(Pinba__Request, memory_peak),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"request_time",
@@ -121,7 +132,8 @@
PROTOBUF_C_OFFSETOF(Pinba__Request, request_time),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"ru_utime",
@@ -132,7 +144,8 @@
PROTOBUF_C_OFFSETOF(Pinba__Request, ru_utime),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"ru_stime",
@@ -143,7 +156,8 @@
PROTOBUF_C_OFFSETOF(Pinba__Request, ru_stime),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"timer_hit_count",
@@ -154,7 +168,8 @@
PROTOBUF_C_OFFSETOF(Pinba__Request, timer_hit_count),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"timer_value",
@@ -165,7 +180,8 @@
PROTOBUF_C_OFFSETOF(Pinba__Request, timer_value),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"timer_tag_count",
@@ -176,7 +192,8 @@
PROTOBUF_C_OFFSETOF(Pinba__Request, timer_tag_count),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"timer_tag_name",
@@ -187,7 +204,8 @@
PROTOBUF_C_OFFSETOF(Pinba__Request, timer_tag_name),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"timer_tag_value",
@@ -198,7 +216,8 @@
PROTOBUF_C_OFFSETOF(Pinba__Request, timer_tag_value),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"dictionary",
@@ -209,7 +228,8 @@
PROTOBUF_C_OFFSETOF(Pinba__Request, dictionary),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"status",
@@ -220,7 +240,8 @@
PROTOBUF_C_OFFSETOF(Pinba__Request, status),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
};
static const unsigned pinba__request__field_indices_by_name[] = {
diff -ru /tmp/pb-c-0.12/riemann.pb-c.c /tmp/pb-c-0.15/riemann.pb-c.c
--- /tmp/pb-c-0.12/riemann.pb-c.c 2013-04-10 17:41:05.437000766 +0200
+++ /tmp/pb-c-0.15/riemann.pb-c.c 2013-04-10 17:42:07.270012460 +0200
@@ -1,5 +1,10 @@
/* Generated by the protocol buffer compiler. DO NOT EDIT! */
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C_NO_DEPRECATED
+#define PROTOBUF_C_NO_DEPRECATED
+#endif
+
#include "riemann.pb-c.h"
void state__init
(State *message)
@@ -227,7 +232,8 @@
PROTOBUF_C_OFFSETOF(State, time),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"state",
@@ -238,7 +244,8 @@
PROTOBUF_C_OFFSETOF(State, state),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"service",
@@ -249,7 +256,8 @@
PROTOBUF_C_OFFSETOF(State, service),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"host",
@@ -260,7 +268,8 @@
PROTOBUF_C_OFFSETOF(State, host),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"description",
@@ -271,7 +280,8 @@
PROTOBUF_C_OFFSETOF(State, description),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"once",
@@ -282,7 +292,8 @@
PROTOBUF_C_OFFSETOF(State, once),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"tags",
@@ -293,7 +304,8 @@
PROTOBUF_C_OFFSETOF(State, tags),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"ttl",
@@ -304,7 +316,8 @@
PROTOBUF_C_OFFSETOF(State, ttl),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
};
static const unsigned state__field_indices_by_name[] = {
@@ -348,7 +361,8 @@
PROTOBUF_C_OFFSETOF(Event, time),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"state",
@@ -359,7 +373,8 @@
PROTOBUF_C_OFFSETOF(Event, state),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"service",
@@ -370,7 +385,8 @@
PROTOBUF_C_OFFSETOF(Event, service),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"host",
@@ -381,7 +397,8 @@
PROTOBUF_C_OFFSETOF(Event, host),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"description",
@@ -392,7 +409,8 @@
PROTOBUF_C_OFFSETOF(Event, description),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"tags",
@@ -403,7 +421,8 @@
PROTOBUF_C_OFFSETOF(Event, tags),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"ttl",
@@ -414,7 +433,8 @@
PROTOBUF_C_OFFSETOF(Event, ttl),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"attributes",
@@ -425,7 +445,8 @@
PROTOBUF_C_OFFSETOF(Event, attributes),
&attribute__descriptor,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"metric_sint64",
@@ -436,7 +457,8 @@
PROTOBUF_C_OFFSETOF(Event, metric_sint64),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"metric_d",
@@ -447,7 +469,8 @@
PROTOBUF_C_OFFSETOF(Event, metric_d),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"metric_f",
@@ -458,7 +481,8 @@
PROTOBUF_C_OFFSETOF(Event, metric_f),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
};
static const unsigned event__field_indices_by_name[] = {
@@ -507,7 +531,8 @@
PROTOBUF_C_OFFSETOF(Query, string),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
};
static const unsigned query__field_indices_by_name[] = {
@@ -544,7 +569,8 @@
PROTOBUF_C_OFFSETOF(Msg, ok),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"error",
@@ -555,7 +581,8 @@
PROTOBUF_C_OFFSETOF(Msg, error),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"states",
@@ -566,7 +593,8 @@
PROTOBUF_C_OFFSETOF(Msg, states),
&state__descriptor,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"query",
@@ -577,7 +605,8 @@
PROTOBUF_C_OFFSETOF(Msg, query),
&query__descriptor,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"events",
@@ -588,7 +617,8 @@
PROTOBUF_C_OFFSETOF(Msg, events),
&event__descriptor,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
};
static const unsigned msg__field_indices_by_name[] = {
@@ -629,7 +659,8 @@
PROTOBUF_C_OFFSETOF(Attribute, key),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"value",
@@ -640,7 +671,8 @@
PROTOBUF_C_OFFSETOF(Attribute, value),
NULL,
NULL,
- NULL,NULL /* reserved1, reserved2 */
+ 0, /* packed */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
},
};
static const unsigned attribute__field_indices_by_name[] = {
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment