summaryrefslogtreecommitdiff
path: root/navit/maptool
diff options
context:
space:
mode:
authorJoseph Herlant <herlantj@gmail.com>2018-05-25 22:07:07 -0700
committerJoseph Herlant <aerostitch@users.noreply.github.com>2018-05-25 22:17:50 -0700
commit41a1264cdd43a11695de85eab0bd3c941abf2b70 (patch)
tree3da1ef3bebc674807258ae824ff9156a64adf370 /navit/maptool
parent8a76acb966f7059caf9d72c853175bd923b1e9d7 (diff)
downloadnavit-41a1264cdd43a11695de85eab0bd3c941abf2b70.tar.gz
cleanup:cmake:remove trailing spaces
Diffstat (limited to 'navit/maptool')
-rw-r--r--navit/maptool/google/protobuf-c/protobuf-c-private.h4
-rw-r--r--navit/maptool/google/protobuf-c/protobuf-c.h16
-rw-r--r--navit/maptool/osmformat.proto20
3 files changed, 20 insertions, 20 deletions
diff --git a/navit/maptool/google/protobuf-c/protobuf-c-private.h b/navit/maptool/google/protobuf-c/protobuf-c-private.h
index 01bbd35aa..53a33b51b 100644
--- a/navit/maptool/google/protobuf-c/protobuf-c-private.h
+++ b/navit/maptool/google/protobuf-c/protobuf-c-private.h
@@ -1,7 +1,7 @@
/* --- protobuf-c-private.h: private structures and functions --- */
/*
* Copyright 2008, Dave Benson.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with
* the License. You may obtain a copy of the License
@@ -64,7 +64,7 @@ protobuf_c_service_generated_init (ProtobufCService *service,
const ProtobufCServiceDescriptor *descriptor,
ProtobufCServiceDestroy destroy);
-void
+void
protobuf_c_service_invoke_internal(ProtobufCService *service,
unsigned method_index,
const ProtobufCMessage *input,
diff --git a/navit/maptool/google/protobuf-c/protobuf-c.h b/navit/maptool/google/protobuf-c/protobuf-c.h
index 98bd77b2a..50af74dac 100644
--- a/navit/maptool/google/protobuf-c/protobuf-c.h
+++ b/navit/maptool/google/protobuf-c/protobuf-c.h
@@ -2,7 +2,7 @@
/*
* Copyright 2008, Dave Benson.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with
* the License. You may obtain a copy of the License
@@ -126,7 +126,7 @@ extern ProtobufCAllocator protobuf_c_default_allocator; /* settable */
*/
extern ProtobufCAllocator protobuf_c_system_allocator; /* use malloc, free etc */
-/* This is the function that our default allocators call when they
+/* This is the function that our default allocators call when they
run out-of-memory. The default behavior of this function is to
terminate your program. */
extern void (*protobuf_c_out_of_memory) (void);
@@ -284,7 +284,7 @@ struct _ProtobufCMessageDescriptor
*
* ProtobufCMessage is sort-of a lightweight
* base-class for all messages.
- *
+ *
* In particular, ProtobufCMessage doesn't have
* any allocation policy associated with it.
* That's because it is common to create ProtobufCMessage's
@@ -311,7 +311,7 @@ struct _ProtobufCMessage
/* To pack a message: you have two options:
(1) you can compute the size of the message
- using protobuf_c_message_get_packed_size()
+ using protobuf_c_message_get_packed_size()
then pass protobuf_c_message_pack() a buffer of
that length.
(2) Provide a virtual buffer (a ProtobufCBuffer) to
@@ -331,7 +331,7 @@ ProtobufCMessage *
void protobuf_c_message_free_unpacked (ProtobufCMessage *message,
ProtobufCAllocator *allocator);
-/* WARNING: 'message' must be a block of memory
+/* WARNING: 'message' must be a block of memory
of size descriptor->sizeof_message. */
#define protobuf_c_message_init(descriptor, message) ((descriptor)->message_init((ProtobufCMessage*) (message)))
@@ -378,11 +378,11 @@ void protobuf_c_service_destroy (ProtobufCService *);
/* --- querying the descriptors --- */
const ProtobufCEnumValue *
-protobuf_c_enum_descriptor_get_value_by_name
+protobuf_c_enum_descriptor_get_value_by_name
(const ProtobufCEnumDescriptor *desc,
const char *name);
const ProtobufCEnumValue *
-protobuf_c_enum_descriptor_get_value
+protobuf_c_enum_descriptor_get_value
(const ProtobufCEnumDescriptor *desc,
int value);
const ProtobufCFieldDescriptor *
@@ -390,7 +390,7 @@ protobuf_c_message_descriptor_get_field_by_name
(const ProtobufCMessageDescriptor *desc,
const char *name);
const ProtobufCFieldDescriptor *
-protobuf_c_message_descriptor_get_field
+protobuf_c_message_descriptor_get_field
(const ProtobufCMessageDescriptor *desc,
unsigned value);
const ProtobufCMethodDescriptor *
diff --git a/navit/maptool/osmformat.proto b/navit/maptool/osmformat.proto
index 73f6472a9..560d71deb 100644
--- a/navit/maptool/osmformat.proto
+++ b/navit/maptool/osmformat.proto
@@ -1,7 +1,7 @@
option java_package = "crosby.binary";
package OSMPBF;
-/* OSM Binary file format
+/* OSM Binary file format
This is the master schema file of the OSM binary file format. This
file is designed to support limited random-access and future
@@ -42,7 +42,7 @@ message HeaderBlock {
repeated string required_features = 4;
repeated string optional_features = 5;
- optional string writingprogram = 16;
+ optional string writingprogram = 16;
optional string source = 17; // From the bbox field.
}
@@ -68,13 +68,13 @@ message PrimitiveBlock {
repeated PrimitiveGroup primitivegroup = 2;
// Granularity, units of nanodegrees, used to store coordinates in this block
- optional int32 granularity = 17 [default=100];
+ optional int32 granularity = 17 [default=100];
// Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees.
optional int64 lat_offset = 19 [default=0];
- optional int64 lon_offset = 20 [default=0];
+ optional int64 lon_offset = 20 [default=0];
// Granularity of dates, normally represented in units of milliseconds since the 1970 epoch.
- optional int32 date_granularity = 18 [default=1000];
+ optional int32 date_granularity = 18 [default=1000];
// Proposed extension:
@@ -112,7 +112,7 @@ message Info {
/** Optional metadata that may be included into each primitive. Special dense format used in DenseNodes. */
message DenseInfo {
- repeated int32 version = 1 [packed = true];
+ repeated int32 version = 1 [packed = true];
repeated sint64 timestamp = 2 [packed = true]; // DELTA coded
repeated sint64 changeset = 3 [packed = true]; // DELTA coded
repeated sint32 uid = 4 [packed = true]; // DELTA coded
@@ -124,7 +124,7 @@ message DenseInfo {
// TODO: REMOVE THIS?
message ChangeSet {
required int64 id = 1;
-//
+//
// // Parallel arrays.
// repeated uint32 keys = 2 [packed = true]; // String IDs.
// repeated uint32 vals = 3 [packed = true]; // String IDs.
@@ -153,7 +153,7 @@ message Node {
/* Used to densly represent a sequence of nodes that do not have any tags.
We represent these nodes columnwise as five columns: ID's, lats, and
-lons, all delta coded. When metadata is not omitted,
+lons, all delta coded. When metadata is not omitted,
We encode keys & vals for all nodes as a single array of integers
containing key-stringid and val-stringid, using a stringid of 0 as a
@@ -172,7 +172,7 @@ message DenseNodes {
repeated sint64 lon = 9 [packed = true]; // DELTA coded
// Special packing of keys and vals into one array. May be empty if all nodes in this block are tagless.
- repeated int32 keys_vals = 10 [packed = true];
+ repeated int32 keys_vals = 10 [packed = true];
}
@@ -192,7 +192,7 @@ message Relation {
NODE = 0;
WAY = 1;
RELATION = 2;
- }
+ }
required int64 id = 1;
// Parallel arrays.