summaryrefslogtreecommitdiff
path: root/navit/maptool/itembin_buffer.c
diff options
context:
space:
mode:
Diffstat (limited to 'navit/maptool/itembin_buffer.c')
-rw-r--r--navit/maptool/itembin_buffer.c62
1 files changed, 29 insertions, 33 deletions
diff --git a/navit/maptool/itembin_buffer.c b/navit/maptool/itembin_buffer.c
index 980749539..a3d63cf17 100644
--- a/navit/maptool/itembin_buffer.c
+++ b/navit/maptool/itembin_buffer.c
@@ -30,48 +30,44 @@ struct item_bin *tmp_item_bin=(struct item_bin *)(void *)misc_item_buffer;
static struct node_item *tmp_node_item=(struct node_item *)(void *)misc_item_buffer;
struct node_item *
-read_node_item(FILE *in)
-{
- if (fread(tmp_node_item, sizeof(struct node_item), 1, in) != 1)
- return NULL;
- return tmp_node_item;
+read_node_item(FILE *in) {
+ if (fread(tmp_node_item, sizeof(struct node_item), 1, in) != 1)
+ return NULL;
+ return tmp_node_item;
}
struct item_bin *
-read_item(FILE *in)
-{
- struct item_bin *ib=(struct item_bin *) misc_item_buffer;
- for (;;) {
- switch (item_bin_read(ib, in)) {
- case 0:
- return NULL;
- case 2:
- dbg_assert((ib->len+1)*4 < sizeof(misc_item_buffer));
- bytes_read+=(ib->len+1)*sizeof(int);
- return ib;
- default:
- continue;
- }
- }
+read_item(FILE *in) {
+ struct item_bin *ib=(struct item_bin *) misc_item_buffer;
+ for (;;) {
+ switch (item_bin_read(ib, in)) {
+ case 0:
+ return NULL;
+ case 2:
+ dbg_assert((ib->len+1)*4 < sizeof(misc_item_buffer));
+ bytes_read+=(ib->len+1)*sizeof(int);
+ return ib;
+ default:
+ continue;
+ }
+ }
}
struct item_bin *
-read_item_range(FILE *in, int *min, int *max)
-{
- struct range r;
+read_item_range(FILE *in, int *min, int *max) {
+ struct range r;
- if (fread(&r, sizeof(r), 1, in) != 1)
- return NULL;
- *min=r.min;
- *max=r.max;
- return read_item(in);
+ if (fread(&r, sizeof(r), 1, in) != 1)
+ return NULL;
+ *min=r.min;
+ *max=r.max;
+ return read_item(in);
}
struct item_bin *
-init_item(enum item_type type)
-{
- struct item_bin *ib=(struct item_bin *) misc_item_buffer;
+init_item(enum item_type type) {
+ struct item_bin *ib=(struct item_bin *) misc_item_buffer;
- item_bin_init(ib, type);
- return ib;
+ item_bin_init(ib, type);
+ return ib;
}