Indenting only change (and a space in a printf format string)

git-svn-id: http://svn.osgeo.org/postgis/trunk@13816 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/liblwgeom/lwgeom_topo.c b/liblwgeom/lwgeom_topo.c
index 2ea2e2a2060bc166c0e5c440fcd627d26ccc2dd8..fb8391478c371fe2e60a2c2bd73e1cc53c5079f2 100644 (file)
--- a/liblwgeom/lwgeom_topo.c
+++ b/liblwgeom/lwgeom_topo.c
@@ -904,7 +904,7 @@ _lwt_FindAdjacentEdges( LWT_TOPOLOGY* topo, LWT_ELEMID node, edgeend *data,
       getPoint2d_p(pa, 0, &p1);
       getPoint2d_p(pa, 1, &p2);
       LWDEBUGF(1, "edge %" PRId64
-                  "starts on node %" PRId64
+                  " starts on node %" PRId64
                   ", edgeend is %g,%g-%g,%g",
                   edge->edge_id, node, p1.x, p1.y, p2.x, p2.y);
       if ( ! azimuth_pt_pt(&p1, &p2, &az) ) {
@@ -933,10 +933,10 @@ _lwt_FindAdjacentEdges( LWT_TOPOLOGY* topo, LWT_ELEMID node, edgeend *data,
         if ( azdif < minaz ) {
           data->nextCW = edge->edge_id; /* outgoing */
           data->cwFace = edge->face_left;
-          LWDEBUGF(1, "new nextCW edge is %" PRId64 ", "
-                      "outgoing, "
-                      "with face_left %" PRId64 " and face_right %" PRId64 " "
-                      "(previous had minaz=%g, face_left is new cwFace)",
+          LWDEBUGF(1, "new nextCW edge is %" PRId64
+                      ", outgoing, "
+                      "with face_left %" PRId64 " and face_right %" PRId64
+                      " (previous had minaz=%g, face_left is new cwFace)",
                       edge->edge_id, edge->face_left,
                       edge->face_right, minaz);
           minaz = azdif;
@@ -944,10 +944,10 @@ _lwt_FindAdjacentEdges( LWT_TOPOLOGY* topo, LWT_ELEMID node, edgeend *data,
         else if ( azdif > maxaz ) {
           data->nextCCW = edge->edge_id; /* outgoing */
           data->ccwFace = edge->face_right;
-          LWDEBUGF(1, "new nextCCW edge is %" PRId64 ", "
-                      "outgoing, "
-                      "with face_left %" PRId64 " and face_right %" PRId64 " "
-                      "(previous had maxaz=%g, face_right is new ccwFace)",
+          LWDEBUGF(1, "new nextCCW edge is %" PRId64
+                      ", outgoing, "
+                      "with face_left %" PRId64 " and face_right %" PRId64
+                      " (previous had maxaz=%g, face_right is new ccwFace)",
                       edge->edge_id, edge->face_left,
                       edge->face_right, maxaz);
           maxaz = azdif;
@@ -976,18 +976,18 @@ _lwt_FindAdjacentEdges( LWT_TOPOLOGY* topo, LWT_ELEMID node, edgeend *data,
         data->nextCW = data->nextCCW = -edge->edge_id; /* incoming */
         data->cwFace = edge->face_right;
         data->ccwFace = edge->face_left;
-        LWDEBUGF(1, "new nextCW and nextCCW edge is %" PRId64 ", "
-                    "incoming, "
-                    "with face_left %" PRId64 " and face_right %" PRId64 " "
-                    "(face_right is new cwFace, face_left is new ccwFace)",
+        LWDEBUGF(1, "new nextCW and nextCCW edge is %" PRId64
+                    ", incoming, "
+                    "with face_left %" PRId64 " and face_right %" PRId64
+                    " (face_right is new cwFace, face_left is new ccwFace)",
                     edge->edge_id, edge->face_left,
                     edge->face_right);
       } else {
         if ( azdif < minaz ) {
           data->nextCW = -edge->edge_id; /* incoming */
           data->cwFace = edge->face_right;
-          LWDEBUGF(1, "new nextCW edge is %" PRId64 ", "
-                      "incoming, "
+          LWDEBUGF(1, "new nextCW edge is %" PRId64
+                      ", incoming, "
                       "with face_left %" PRId64 " and face_right %" PRId64
                       " (previous had minaz=%g, face_right is new cwFace)",
                       edge->edge_id, edge->face_left,
@@ -997,8 +997,8 @@ _lwt_FindAdjacentEdges( LWT_TOPOLOGY* topo, LWT_ELEMID node, edgeend *data,
         else if ( azdif > maxaz ) {
           data->nextCCW = -edge->edge_id; /* incoming */
           data->ccwFace = edge->face_left;
-          LWDEBUGF(1, "new nextCCW edge is %" PRId64 ", "
-                      "outgoing from start point, "
+          LWDEBUGF(1, "new nextCCW edge is %" PRId64
+                      ", outgoing, from start point, "
                       "with face_left %" PRId64 " and face_right %" PRId64
                       " (previous had maxaz=%g, face_left is new ccwFace)",
                       edge->edge_id, edge->face_left,

diff --git a/topology/postgis_topology.c b/topology/postgis_topology.c
index 73a6dcd26f61d3781c1b8abe3ab1a478e9b638a3..47ae5854522bc505664ac3b52e1535f0c414daea 100644 (file)
--- a/topology/postgis_topology.c
+++ b/topology/postgis_topology.c
@@ -216,8 +216,10 @@ addEdgeValues(StringInfo str, const LWT_ISO_EDGE *edge, int fields, int fullEdge
 
   appendStringInfoChar(str, '(');
   if ( fields & LWT_COL_EDGE_EDGE_ID ) {
-    if ( edge->edge_id != -1 ) appendStringInfo(str, "%" PRId64, edge->edge_id);
-    else appendStringInfoString(str, "DEFAULT");
+    if ( edge->edge_id != -1 )
+      appendStringInfo(str, "%" PRId64, edge->edge_id);
+    else
+      appendStringInfoString(str, "DEFAULT");
     sep = ",";
   }
   if ( fields & LWT_COL_EDGE_START_NODE ) {
@@ -238,12 +240,14 @@ addEdgeValues(StringInfo str, const LWT_ISO_EDGE *edge, int fields, int fullEdge
   }
   if ( fields & LWT_COL_EDGE_NEXT_LEFT ) {
     appendStringInfo(str, "%s%" PRId64, sep, edge->next_left);
-    if ( fullEdgeData ) appendStringInfo(str, ",%" PRId64, ABS(edge->next_left));
+    if ( fullEdgeData )
+      appendStringInfo(str, ",%" PRId64, ABS(edge->next_left));
     sep = ",";
   }
   if ( fields & LWT_COL_EDGE_NEXT_RIGHT ) {
     appendStringInfo(str, "%s%" PRId64, sep, edge->next_right);
-    if ( fullEdgeData ) appendStringInfo(str, ",%" PRId64, ABS(edge->next_right));
+    if ( fullEdgeData )
+      appendStringInfo(str, ",%" PRId64, ABS(edge->next_right));
     sep = ",";
   }
   if ( fields & LWT_COL_EDGE_GEOM )
@@ -439,8 +443,10 @@ addNodeValues(StringInfo str, const LWT_ISO_NODE *node, int fields)
   appendStringInfoChar(str, '(');
 
   if ( fields & LWT_COL_NODE_NODE_ID ) {
-    if ( node->node_id != -1 ) appendStringInfo(str, "%" PRId64, node->node_id);
-    else appendStringInfoString(str, "DEFAULT");
+    if ( node->node_id != -1 )
+      appendStringInfo(str, "%" PRId64, node->node_id);
+    else
+      appendStringInfoString(str, "DEFAULT");
     sep = ",";
   }
 
@@ -468,8 +474,10 @@ addNodeValues(StringInfo str, const LWT_ISO_NODE *node, int fields)
 static void
 addFaceValues(StringInfo str, LWT_ISO_FACE *face, int srid)
 {
-  if ( face->face_id != -1 ) appendStringInfo(str, "(%" PRId64, face->face_id);
-  else appendStringInfoString(str, "(DEFAULT");
+  if ( face->face_id != -1 )
+    appendStringInfo(str, "(%" PRId64, face->face_id);
+  else
+    appendStringInfoString(str, "(DEFAULT");
 
   if ( face->mbr ) {
     appendStringInfo(str, ",ST_SetSRID(ST_MakeEnvelope(%g,%g,%g,%g),%d))",