Permalink
Browse files

Removed some superfluous spaces

  • Loading branch information...
1 parent 98ebe51 commit b384b5cd53be2737df2b4fa22ef4f5c7053e6f25 @doublecreations doublecreations committed May 2, 2012
Showing with 0 additions and 33 deletions.
  1. +0 −33 src/quadtree_private.h
View
@@ -24,10 +24,8 @@
#include "quadtree.h"
-
typedef void Node;
-
struct _Inner;
struct _Leaf;
struct _TransNode;
@@ -41,9 +39,6 @@ typedef struct _FinaliseState FinaliseState;
typedef struct _Qt_Itr_Frame Qt_Itr_Frame;
-
-
-
/*
* Note that both Inner and Leaf are __packed__ for portability.
* (see: http://gcc.gnu.org/onlinedocs/gcc/Type-Attributes.html)
@@ -92,10 +87,7 @@ struct _TransNode {
};
-
-
struct UFQuadTree {
-
TransNode *root;
Quadrant region;
@@ -107,7 +99,6 @@ struct UFQuadTree {
u_int64_t ninners;
u_int64_t nleafs;
-
};
@@ -166,9 +157,7 @@ struct Qt_Iterator {
};
-
struct _FinaliseState {
-
const QuadTree *quadtree;
u_int64_t ninners;
@@ -182,7 +171,6 @@ struct _FinaliseState {
void *next_leaf;
TransNode *cur_trans;
-
};
@@ -197,7 +185,6 @@ inline void _qt_finalise(FinaliseState *st);
inline void _include_leaf(Item ***items, u_int64_t *offset, u_int64_t *size, Leaf *leaf, Quadrant *region,_Bool within);
inline void _gen_quadrants(const Quadrant *region, Quadrant *mem);
-
void _qt_insert(UFQuadTree *qt, TransNode *node, Item *item, Quadrant *quadrant, unsigned int depth);
int _itemcmp(Item **a, Item **b);
int _itemcmp_direct(Item *a, Item *b);
@@ -209,8 +196,6 @@ void _read_mem(void *mem, int fd, u_int64_t bytes);
u_int64_t _mem_size(const UFQuadTree *qt);
-
-
/*
* Coordinates:
*
@@ -229,24 +214,16 @@ u_int64_t _mem_size(const UFQuadTree *qt);
*
***************/
-
-
-
#define NORTH(x) ((x) = (x) & NE)
#define SOUTH(x) ((x) = (x) | SW)
#define EAST(x) ((x) = (x) | NE)
#define WEST(x) ((x) = (x) & SW)
#define ISSOUTH(x) ((x) & SW)
#define ISNORTH(x) (!ISSOUTH(x))
-
#define ISEAST(x) ((x) & NE)
#define ISWEST(x) (!ISEAST(x))
-
-
-
-
#define OVERLAP(qA, qB) \
( \
((qA).sw[X] <= (qB).ne[X]) * ((qA).sw[Y] <= (qB).ne[Y]) \
@@ -264,23 +241,18 @@ u_int64_t _mem_size(const UFQuadTree *qt);
)
-
#define ASSERT_REGION_SANE(region) \
assert((region)->ne[X] > (region)->sw[X]); \
assert((region)->ne[Y] > (region)->sw[Y]);
-
-
-
#define IS_LEAF(quadtree, node) \
((node) >= MEM_LEAFS(quadtree))
#define IS_INNER(quadtree, node) \
!IS_LEAF(quadtree, node)
-
#define MEM_INNERS(quadtree) ((void *)(((void *)(quadtree))+sizeof(QuadTree)))
#define MEM_LEAFS(quadtree) ((void *)(MEM_INNERS(quadtree) + (quadtree)->ninners*sizeof(Inner)))
@@ -290,15 +262,10 @@ u_int64_t _mem_size(const UFQuadTree *qt);
div_y = (region)->sw[Y] + ((region)->ne[Y] - (region)->sw[Y]) / 2;
-
-
#define MEM_ROOT(quadtree) MEM_INNERS(quadtree)
#define ROOT ((u_int64_t)0)
-
-
-
#define FRAME(itr,so) ((itr)->stack[so])
#define NEXTFRAME(itr,so) ((itr)->stack[so+1])
#define PREVFRAME(itr,so) ((itr)->stack[so-1])

0 comments on commit b384b5c

Please sign in to comment.