pbf_parser 0.1.0 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/ext/pbf_parser/extconf.rb +2 -2
  3. data/ext/pbf_parser/fileformat.pb-c.c +89 -88
  4. data/ext/pbf_parser/fileformat.pb-c.h +53 -46
  5. data/ext/pbf_parser/osmformat.pb-c.c +584 -583
  6. data/ext/pbf_parser/osmformat.pb-c.h +272 -264
  7. data/ext/pbf_parser/pbf_parser.c +33 -33
  8. data/lib/pbf_parser/version.rb +3 -0
  9. data/lib/pbf_parser.rb +1 -0
  10. metadata +4 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5341b491bdc9e0695a864bb7b190d226dc8ad2ca
4
- data.tar.gz: 988771cfcd757689ceb0c4875722d9653b345720
3
+ metadata.gz: 6e6239b4100dfc86129e84cec4952cfd68a278ef
4
+ data.tar.gz: 64404cd0061c724624e3f67ae81b7daaf6e08d33
5
5
  SHA512:
6
- metadata.gz: 4eebbaf35074633ae16866fa1d59b888159aa9f53425fc3ebb61ffa46bf501c6c4a7d6e1c1fbb0f4b7cd41b184bd563d2b4ab9a77f2f53b8c66694a4121c95ee
7
- data.tar.gz: b036b89bbaaa41f986a79686d61fe116eeb838be457cad07041c936dcabeba0de1e2a48f1e7b1fd4736bc6971c3eb64bf99c51445e60e1b10e7d9c0043838985
6
+ metadata.gz: f0c735698a0df9589358b3ad9fa39058fbac6218b903e18e01bae760893599cbdb7495f17e91f9b8438877b20794052e0fcce3b478567a7c5e964a02c89cde04
7
+ data.tar.gz: 03c8ee81d468ec20f62b8330c76ee29196cf37f78ec644cda128156eac817c2ae3d7d90a27d9b6156ab74992b9fdca436c1d9d7bc8ca8866809ddab8fe83669e
data/ext/pbf_parser/extconf.rb CHANGED
@@ -17,10 +17,10 @@ LIB_DIRS = [
17
17
  LIBDIR
18
18
  ]
19
19
 
20
- dir_config('protobuf-c', HEADER_DIRS, LIB_DIRS)
20
+ dir_config('libprotobuf-c', HEADER_DIRS, LIB_DIRS)
21
21
  dir_config('zlib', HEADER_DIRS, LIB_DIRS)
22
22
 
23
- abort "protobuf-c is required" unless find_header('google/protobuf-c/protobuf-c.h')
23
+ abort "protobuf-c is required" unless find_header('protobuf-c/protobuf-c.h')
24
24
  abort "zlib is required" unless find_header('zlib.h')
25
25
 
26
26
  abort "protobuf-c is required" unless find_library('protobuf-c', 'protobuf_c_message_unpack')
data/ext/pbf_parser/fileformat.pb-c.c CHANGED
@@ -1,109 +1,110 @@
1
1
  /* Generated by the protocol buffer compiler. DO NOT EDIT! */
2
+ /* Generated from: fileformat.proto */
2
3
 
3
4
  /* Do not generate deprecated warnings for self */
4
- #ifndef PROTOBUF_C_NO_DEPRECATED
5
- #define PROTOBUF_C_NO_DEPRECATED
5
+ #ifndef PROTOBUF_C__NO_DEPRECATED
6
+ #define PROTOBUF_C__NO_DEPRECATED
6
7
  #endif
7
8
 
8
9
  #include "fileformat.pb-c.h"
9
- void blob__init
10
- (Blob *message)
10
+ void osmpbf__blob__init
11
+ (OSMPBF__Blob *message)
11
12
  {
12
- static Blob init_value = BLOB__INIT;
13
+ static OSMPBF__Blob init_value = OSMPBF__BLOB__INIT;
13
14
  *message = init_value;
14
15
  }
15
- size_t blob__get_packed_size
16
- (const Blob *message)
16
+ size_t osmpbf__blob__get_packed_size
17
+ (const OSMPBF__Blob *message)
17
18
  {
18
- PROTOBUF_C_ASSERT (message->base.descriptor == &blob__descriptor);
19
+ assert(message->base.descriptor == &osmpbf__blob__descriptor);
19
20
  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
20
21
  }
21
- size_t blob__pack
22
- (const Blob *message,
22
+ size_t osmpbf__blob__pack
23
+ (const OSMPBF__Blob *message,
23
24
  uint8_t *out)
24
25
  {
25
- PROTOBUF_C_ASSERT (message->base.descriptor == &blob__descriptor);
26
+ assert(message->base.descriptor == &osmpbf__blob__descriptor);
26
27
  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
27
28
  }
28
- size_t blob__pack_to_buffer
29
- (const Blob *message,
29
+ size_t osmpbf__blob__pack_to_buffer
30
+ (const OSMPBF__Blob *message,
30
31
  ProtobufCBuffer *buffer)
31
32
  {
32
- PROTOBUF_C_ASSERT (message->base.descriptor == &blob__descriptor);
33
+ assert(message->base.descriptor == &osmpbf__blob__descriptor);
33
34
  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
34
35
  }
35
- Blob *
36
- blob__unpack
36
+ OSMPBF__Blob *
37
+ osmpbf__blob__unpack
37
38
  (ProtobufCAllocator *allocator,
38
39
  size_t len,
39
40
  const uint8_t *data)
40
41
  {
41
- return (Blob *)
42
- protobuf_c_message_unpack (&blob__descriptor,
42
+ return (OSMPBF__Blob *)
43
+ protobuf_c_message_unpack (&osmpbf__blob__descriptor,
43
44
  allocator, len, data);
44
45
  }
45
- void blob__free_unpacked
46
- (Blob *message,
46
+ void osmpbf__blob__free_unpacked
47
+ (OSMPBF__Blob *message,
47
48
  ProtobufCAllocator *allocator)
48
49
  {
49
- PROTOBUF_C_ASSERT (message->base.descriptor == &blob__descriptor);
50
+ assert(message->base.descriptor == &osmpbf__blob__descriptor);
50
51
  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
51
52
  }
52
- void blob_header__init
53
- (BlobHeader *message)
53
+ void osmpbf__blob_header__init
54
+ (OSMPBF__BlobHeader *message)
54
55
  {
55
- static BlobHeader init_value = BLOB_HEADER__INIT;
56
+ static OSMPBF__BlobHeader init_value = OSMPBF__BLOB_HEADER__INIT;
56
57
  *message = init_value;
57
58
  }
58
- size_t blob_header__get_packed_size
59
- (const BlobHeader *message)
59
+ size_t osmpbf__blob_header__get_packed_size
60
+ (const OSMPBF__BlobHeader *message)
60
61
  {
61
- PROTOBUF_C_ASSERT (message->base.descriptor == &blob_header__descriptor);
62
+ assert(message->base.descriptor == &osmpbf__blob_header__descriptor);
62
63
  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
63
64
  }
64
- size_t blob_header__pack
65
- (const BlobHeader *message,
65
+ size_t osmpbf__blob_header__pack
66
+ (const OSMPBF__BlobHeader *message,
66
67
  uint8_t *out)
67
68
  {
68
- PROTOBUF_C_ASSERT (message->base.descriptor == &blob_header__descriptor);
69
+ assert(message->base.descriptor == &osmpbf__blob_header__descriptor);
69
70
  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
70
71
  }
71
- size_t blob_header__pack_to_buffer
72
- (const BlobHeader *message,
72
+ size_t osmpbf__blob_header__pack_to_buffer
73
+ (const OSMPBF__BlobHeader *message,
73
74
  ProtobufCBuffer *buffer)
74
75
  {
75
- PROTOBUF_C_ASSERT (message->base.descriptor == &blob_header__descriptor);
76
+ assert(message->base.descriptor == &osmpbf__blob_header__descriptor);
76
77
  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
77
78
  }
78
- BlobHeader *
79
- blob_header__unpack
79
+ OSMPBF__BlobHeader *
80
+ osmpbf__blob_header__unpack
80
81
  (ProtobufCAllocator *allocator,
81
82
  size_t len,
82
83
  const uint8_t *data)
83
84
  {
84
- return (BlobHeader *)
85
- protobuf_c_message_unpack (&blob_header__descriptor,
85
+ return (OSMPBF__BlobHeader *)
86
+ protobuf_c_message_unpack (&osmpbf__blob_header__descriptor,
86
87
  allocator, len, data);
87
88
  }
88
- void blob_header__free_unpacked
89
- (BlobHeader *message,
89
+ void osmpbf__blob_header__free_unpacked
90
+ (OSMPBF__BlobHeader *message,
90
91
  ProtobufCAllocator *allocator)
91
92
  {
92
- PROTOBUF_C_ASSERT (message->base.descriptor == &blob_header__descriptor);
93
+ assert(message->base.descriptor == &osmpbf__blob_header__descriptor);
93
94
  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
94
95
  }
95
- static const ProtobufCFieldDescriptor blob__field_descriptors[5] =
96
+ static const ProtobufCFieldDescriptor osmpbf__blob__field_descriptors[5] =
96
97
  {
97
98
  {
98
99
  "raw",
99
100
  1,
100
101
  PROTOBUF_C_LABEL_OPTIONAL,
101
102
  PROTOBUF_C_TYPE_BYTES,
102
- PROTOBUF_C_OFFSETOF(Blob, has_raw),
103
- PROTOBUF_C_OFFSETOF(Blob, raw),
103
+ offsetof(OSMPBF__Blob, has_raw),
104
+ offsetof(OSMPBF__Blob, raw),
104
105
  NULL,
105
106
  NULL,
106
- 0, /* packed */
107
+ 0, /* flags */
107
108
  0,NULL,NULL /* reserved1,reserved2, etc */
108
109
  },
109
110
  {
@@ -111,11 +112,11 @@ static const ProtobufCFieldDescriptor blob__field_descriptors[5] =
111
112
  2,
112
113
  PROTOBUF_C_LABEL_OPTIONAL,
113
114
  PROTOBUF_C_TYPE_INT32,
114
- PROTOBUF_C_OFFSETOF(Blob, has_raw_size),
115
- PROTOBUF_C_OFFSETOF(Blob, raw_size),
115
+ offsetof(OSMPBF__Blob, has_raw_size),
116
+ offsetof(OSMPBF__Blob, raw_size),
116
117
  NULL,
117
118
  NULL,
118
- 0, /* packed */
119
+ 0, /* flags */
119
120
  0,NULL,NULL /* reserved1,reserved2, etc */
120
121
  },
121
122
  {
@@ -123,11 +124,11 @@ static const ProtobufCFieldDescriptor blob__field_descriptors[5] =
123
124
  3,
124
125
  PROTOBUF_C_LABEL_OPTIONAL,
125
126
  PROTOBUF_C_TYPE_BYTES,
126
- PROTOBUF_C_OFFSETOF(Blob, has_zlib_data),
127
- PROTOBUF_C_OFFSETOF(Blob, zlib_data),
127
+ offsetof(OSMPBF__Blob, has_zlib_data),
128
+ offsetof(OSMPBF__Blob, zlib_data),
128
129
  NULL,
129
130
  NULL,
130
- 0, /* packed */
131
+ 0, /* flags */
131
132
  0,NULL,NULL /* reserved1,reserved2, etc */
132
133
  },
133
134
  {
@@ -135,11 +136,11 @@ static const ProtobufCFieldDescriptor blob__field_descriptors[5] =
135
136
  4,
136
137
  PROTOBUF_C_LABEL_OPTIONAL,
137
138
  PROTOBUF_C_TYPE_BYTES,
138
- PROTOBUF_C_OFFSETOF(Blob, has_lzma_data),
139
- PROTOBUF_C_OFFSETOF(Blob, lzma_data),
139
+ offsetof(OSMPBF__Blob, has_lzma_data),
140
+ offsetof(OSMPBF__Blob, lzma_data),
140
141
  NULL,
141
142
  NULL,
142
- 0, /* packed */
143
+ 0, /* flags */
143
144
  0,NULL,NULL /* reserved1,reserved2, etc */
144
145
  },
145
146
  {
@@ -147,42 +148,42 @@ static const ProtobufCFieldDescriptor blob__field_descriptors[5] =
147
148
  5,
148
149
  PROTOBUF_C_LABEL_OPTIONAL,
149
150
  PROTOBUF_C_TYPE_BYTES,
150
- PROTOBUF_C_OFFSETOF(Blob, has_obsolete_bzip2_data),
151
- PROTOBUF_C_OFFSETOF(Blob, obsolete_bzip2_data),
151
+ offsetof(OSMPBF__Blob, has_obsolete_bzip2_data),
152
+ offsetof(OSMPBF__Blob, obsolete_bzip2_data),
152
153
  NULL,
153
154
  NULL,
154
- 0, /* packed */
155
+ 0 | PROTOBUF_C_FIELD_FLAG_DEPRECATED, /* flags */
155
156
  0,NULL,NULL /* reserved1,reserved2, etc */
156
157
  },
157
158
  };
158
- static const unsigned blob__field_indices_by_name[] = {
159
+ static const unsigned osmpbf__blob__field_indices_by_name[] = {
159
160
  4, /* field[4] = OBSOLETE_bzip2_data */
160
161
  3, /* field[3] = lzma_data */
161
162
  0, /* field[0] = raw */
162
163
  1, /* field[1] = raw_size */
163
164
  2, /* field[2] = zlib_data */
164
165
  };
165
- static const ProtobufCIntRange blob__number_ranges[1 + 1] =
166
+ static const ProtobufCIntRange osmpbf__blob__number_ranges[1 + 1] =
166
167
  {
167
168
  { 1, 0 },
168
169
  { 0, 5 }
169
170
  };
170
- const ProtobufCMessageDescriptor blob__descriptor =
171
+ const ProtobufCMessageDescriptor osmpbf__blob__descriptor =
171
172
  {
172
- PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
173
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
174
+ "OSMPBF.Blob",
173
175
  "Blob",
174
- "Blob",
175
- "Blob",
176
- "",
177
- sizeof(Blob),
176
+ "OSMPBF__Blob",
177
+ "OSMPBF",
178
+ sizeof(OSMPBF__Blob),
178
179
  5,
179
- blob__field_descriptors,
180
- blob__field_indices_by_name,
181
- 1, blob__number_ranges,
182
- (ProtobufCMessageInit) blob__init,
180
+ osmpbf__blob__field_descriptors,
181
+ osmpbf__blob__field_indices_by_name,
182
+ 1, osmpbf__blob__number_ranges,
183
+ (ProtobufCMessageInit) osmpbf__blob__init,
183
184
  NULL,NULL,NULL /* reserved[123] */
184
185
  };
185
- static const ProtobufCFieldDescriptor blob_header__field_descriptors[3] =
186
+ static const ProtobufCFieldDescriptor osmpbf__blob_header__field_descriptors[3] =
186
187
  {
187
188
  {
188
189
  "type",
@@ -190,10 +191,10 @@ static const ProtobufCFieldDescriptor blob_header__field_descriptors[3] =
190
191
  PROTOBUF_C_LABEL_REQUIRED,
191
192
  PROTOBUF_C_TYPE_STRING,
192
193
  0, /* quantifier_offset */
193
- PROTOBUF_C_OFFSETOF(BlobHeader, type),
194
+ offsetof(OSMPBF__BlobHeader, type),
194
195
  NULL,
195
196
  NULL,
196
- 0, /* packed */
197
+ 0, /* flags */
197
198
  0,NULL,NULL /* reserved1,reserved2, etc */
198
199
  },
199
200
  {
@@ -201,11 +202,11 @@ static const ProtobufCFieldDescriptor blob_header__field_descriptors[3] =
201
202
  2,
202
203
  PROTOBUF_C_LABEL_OPTIONAL,
203
204
  PROTOBUF_C_TYPE_BYTES,
204
- PROTOBUF_C_OFFSETOF(BlobHeader, has_indexdata),
205
- PROTOBUF_C_OFFSETOF(BlobHeader, indexdata),
205
+ offsetof(OSMPBF__BlobHeader, has_indexdata),
206
+ offsetof(OSMPBF__BlobHeader, indexdata),
206
207
  NULL,
207
208
  NULL,
208
- 0, /* packed */
209
+ 0, /* flags */
209
210
  0,NULL,NULL /* reserved1,reserved2, etc */
210
211
  },
211
212
  {
@@ -214,35 +215,35 @@ static const ProtobufCFieldDescriptor blob_header__field_descriptors[3] =
214
215
  PROTOBUF_C_LABEL_REQUIRED,
215
216
  PROTOBUF_C_TYPE_INT32,
216
217
  0, /* quantifier_offset */
217
- PROTOBUF_C_OFFSETOF(BlobHeader, datasize),
218
+ offsetof(OSMPBF__BlobHeader, datasize),
218
219
  NULL,
219
220
  NULL,
220
- 0, /* packed */
221
+ 0, /* flags */
221
222
  0,NULL,NULL /* reserved1,reserved2, etc */
222
223
  },
223
224
  };
224
- static const unsigned blob_header__field_indices_by_name[] = {
225
+ static const unsigned osmpbf__blob_header__field_indices_by_name[] = {
225
226
  2, /* field[2] = datasize */
226
227
  1, /* field[1] = indexdata */
227
228
  0, /* field[0] = type */
228
229
  };
229
- static const ProtobufCIntRange blob_header__number_ranges[1 + 1] =
230
+ static const ProtobufCIntRange osmpbf__blob_header__number_ranges[1 + 1] =
230
231
  {
231
232
  { 1, 0 },
232
233
  { 0, 3 }
233
234
  };
234
- const ProtobufCMessageDescriptor blob_header__descriptor =
235
+ const ProtobufCMessageDescriptor osmpbf__blob_header__descriptor =
235
236
  {
236
- PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
237
- "BlobHeader",
238
- "BlobHeader",
237
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
238
+ "OSMPBF.BlobHeader",
239
239
  "BlobHeader",
240
- "",
241
- sizeof(BlobHeader),
240
+ "OSMPBF__BlobHeader",
241
+ "OSMPBF",
242
+ sizeof(OSMPBF__BlobHeader),
242
243
  3,
243
- blob_header__field_descriptors,
244
- blob_header__field_indices_by_name,
245
- 1, blob_header__number_ranges,
246
- (ProtobufCMessageInit) blob_header__init,
244
+ osmpbf__blob_header__field_descriptors,
245
+ osmpbf__blob_header__field_indices_by_name,
246
+ 1, osmpbf__blob_header__number_ranges,
247
+ (ProtobufCMessageInit) osmpbf__blob_header__init,
247
248
  NULL,NULL,NULL /* reserved[123] */
248
249
  };
data/ext/pbf_parser/fileformat.pb-c.h CHANGED
@@ -1,15 +1,22 @@
1
1
  /* Generated by the protocol buffer compiler. DO NOT EDIT! */
2
+ /* Generated from: fileformat.proto */
2
3
 
3
4
  #ifndef PROTOBUF_C_fileformat_2eproto__INCLUDED
4
5
  #define PROTOBUF_C_fileformat_2eproto__INCLUDED
5
6
 
6
- #include <google/protobuf-c/protobuf-c.h>
7
+ #include <protobuf-c/protobuf-c.h>
7
8
 
8
- PROTOBUF_C_BEGIN_DECLS
9
+ PROTOBUF_C__BEGIN_DECLS
9
10
 
11
+ #if PROTOBUF_C_VERSION_NUMBER < 1000000
12
+ # error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
13
+ #elif 1000002 < PROTOBUF_C_MIN_COMPILER_VERSION
14
+ # error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
15
+ #endif
10
16
 
11
- typedef struct _Blob Blob;
12
- typedef struct _BlobHeader BlobHeader;
17
+
18
+ typedef struct _OSMPBF__Blob OSMPBF__Blob;
19
+ typedef struct _OSMPBF__BlobHeader OSMPBF__BlobHeader;
13
20
 
14
21
 
15
22
  /* --- enums --- */
@@ -17,7 +24,7 @@ typedef struct _BlobHeader BlobHeader;
17
24
 
18
25
  /* --- messages --- */
19
26
 
20
- struct _Blob
27
+ struct _OSMPBF__Blob
21
28
  {
22
29
  ProtobufCMessage base;
23
30
  protobuf_c_boolean has_raw;
@@ -28,15 +35,15 @@ struct _Blob
28
35
  ProtobufCBinaryData zlib_data;
29
36
  protobuf_c_boolean has_lzma_data;
30
37
  ProtobufCBinaryData lzma_data;
31
- protobuf_c_boolean has_obsolete_bzip2_data PROTOBUF_C_DEPRECATED;
32
- ProtobufCBinaryData obsolete_bzip2_data PROTOBUF_C_DEPRECATED;
38
+ protobuf_c_boolean has_obsolete_bzip2_data PROTOBUF_C__DEPRECATED;
39
+ ProtobufCBinaryData obsolete_bzip2_data PROTOBUF_C__DEPRECATED;
33
40
  };
34
- #define BLOB__INIT \
35
- { PROTOBUF_C_MESSAGE_INIT (&blob__descriptor) \
41
+ #define OSMPBF__BLOB__INIT \
42
+ { PROTOBUF_C_MESSAGE_INIT (&osmpbf__blob__descriptor) \
36
43
  , 0,{0,NULL}, 0,0, 0,{0,NULL}, 0,{0,NULL}, 0,{0,NULL} }
37
44
 
38
45
 
39
- struct _BlobHeader
46
+ struct _OSMPBF__BlobHeader
40
47
  {
41
48
  ProtobufCMessage base;
42
49
  char *type;
@@ -44,56 +51,56 @@ struct _BlobHeader
44
51
  ProtobufCBinaryData indexdata;
45
52
  int32_t datasize;
46
53
  };
47
- #define BLOB_HEADER__INIT \
48
- { PROTOBUF_C_MESSAGE_INIT (&blob_header__descriptor) \
54
+ #define OSMPBF__BLOB_HEADER__INIT \
55
+ { PROTOBUF_C_MESSAGE_INIT (&osmpbf__blob_header__descriptor) \
49
56
  , NULL, 0,{0,NULL}, 0 }
50
57
 
51
58
 
52
- /* Blob methods */
53
- void blob__init
54
- (Blob *message);
55
- size_t blob__get_packed_size
56
- (const Blob *message);
57
- size_t blob__pack
58
- (const Blob *message,
59
+ /* OSMPBF__Blob methods */
60
+ void osmpbf__blob__init
61
+ (OSMPBF__Blob *message);
62
+ size_t osmpbf__blob__get_packed_size
63
+ (const OSMPBF__Blob *message);
64
+ size_t osmpbf__blob__pack
65
+ (const OSMPBF__Blob *message,
59
66
  uint8_t *out);
60
- size_t blob__pack_to_buffer
61
- (const Blob *message,
67
+ size_t osmpbf__blob__pack_to_buffer
68
+ (const OSMPBF__Blob *message,
62
69
  ProtobufCBuffer *buffer);
63
- Blob *
64
- blob__unpack
70
+ OSMPBF__Blob *
71
+ osmpbf__blob__unpack
65
72
  (ProtobufCAllocator *allocator,
66
73
  size_t len,
67
74
  const uint8_t *data);
68
- void blob__free_unpacked
69
- (Blob *message,
75
+ void osmpbf__blob__free_unpacked
76
+ (OSMPBF__Blob *message,
70
77
  ProtobufCAllocator *allocator);
71
- /* BlobHeader methods */
72
- void blob_header__init
73
- (BlobHeader *message);
74
- size_t blob_header__get_packed_size
75
- (const BlobHeader *message);
76
- size_t blob_header__pack
77
- (const BlobHeader *message,
78
+ /* OSMPBF__BlobHeader methods */
79
+ void osmpbf__blob_header__init
80
+ (OSMPBF__BlobHeader *message);
81
+ size_t osmpbf__blob_header__get_packed_size
82
+ (const OSMPBF__BlobHeader *message);
83
+ size_t osmpbf__blob_header__pack
84
+ (const OSMPBF__BlobHeader *message,
78
85
  uint8_t *out);
79
- size_t blob_header__pack_to_buffer
80
- (const BlobHeader *message,
86
+ size_t osmpbf__blob_header__pack_to_buffer
87
+ (const OSMPBF__BlobHeader *message,
81
88
  ProtobufCBuffer *buffer);
82
- BlobHeader *
83
- blob_header__unpack
89
+ OSMPBF__BlobHeader *
90
+ osmpbf__blob_header__unpack
84
91
  (ProtobufCAllocator *allocator,
85
92
  size_t len,
86
93
  const uint8_t *data);
87
- void blob_header__free_unpacked
88
- (BlobHeader *message,
94
+ void osmpbf__blob_header__free_unpacked
95
+ (OSMPBF__BlobHeader *message,
89
96
  ProtobufCAllocator *allocator);
90
97
  /* --- per-message closures --- */
91
98
 
92
- typedef void (*Blob_Closure)
93
- (const Blob *message,
99
+ typedef void (*OSMPBF__Blob_Closure)
100
+ (const OSMPBF__Blob *message,
94
101
  void *closure_data);
95
- typedef void (*BlobHeader_Closure)
96
- (const BlobHeader *message,
102
+ typedef void (*OSMPBF__BlobHeader_Closure)
103
+ (const OSMPBF__BlobHeader *message,
97
104
  void *closure_data);
98
105
 
99
106
  /* --- services --- */
@@ -101,10 +108,10 @@ typedef void (*BlobHeader_Closure)
101
108
 
102
109
  /* --- descriptors --- */
103
110
 
104
- extern const ProtobufCMessageDescriptor blob__descriptor;
105
- extern const ProtobufCMessageDescriptor blob_header__descriptor;
111
+ extern const ProtobufCMessageDescriptor osmpbf__blob__descriptor;
112
+ extern const ProtobufCMessageDescriptor osmpbf__blob_header__descriptor;
106
113
 
107
- PROTOBUF_C_END_DECLS
114
+ PROTOBUF_C__END_DECLS
108
115
 
109
116
 
110
- #endif /* PROTOBUF_fileformat_2eproto__INCLUDED */
117
+ #endif /* PROTOBUF_C_fileformat_2eproto__INCLUDED */