[brlcad-commits] SF.net SVN: brlcad:[51387] brlcad/trunk/src/librt/primitives/cline/cline.c

[<eri...@us...>]

Revision: 51387
          http://brlcad.svn.sourceforge.net/brlcad/?rev=51387&view=rev
Author:   erikgreenwald
Date:     2012-07-02 12:06:10 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
rename pipe to avoid shadow warning

Modified Paths:
--------------
    brlcad/trunk/src/librt/primitives/cline/cline.c

Modified: brlcad/trunk/src/librt/primitives/cline/cline.c
===================================================================
--- brlcad/trunk/src/librt/primitives/cline/cline.c	2012-07-02 05:24:19 UTC (rev 51386)
+++ brlcad/trunk/src/librt/primitives/cline/cline.c	2012-07-02 12:06:10 UTC (rev 51387)
@@ -1139,7 +1139,7 @@
  *
  */
 int
-rt_cline_to_pipe(struct rt_pipe_internal *pipe, const struct rt_db_internal *ip)
+rt_cline_to_pipe(struct rt_pipe_internal *pipep, const struct rt_db_internal *ip)
 {
     struct rt_cline_internal *cip;
     struct wdb_pipept *point, *point2;
@@ -1151,20 +1151,20 @@
     cip = (struct rt_cline_internal *)ip->idb_ptr;
     RT_CLINE_CK_MAGIC(cip);
 
-    if (!pipe)
+    if (!pipep)
 	return -1;
 
-    pipe->pipe_magic = RT_PIPE_INTERNAL_MAGIC;
-    pipe->pipe_count = 1;
+    pipep->pipe_magic = RT_PIPE_INTERNAL_MAGIC;
+    pipep->pipe_count = 1;
 
-    BU_LIST_INIT(&pipe->pipe_segs_head);
+    BU_LIST_INIT(&pipep->pipe_segs_head);
     BU_GET(point, struct wdb_pipept);
     point->pp_bendradius = 0.0;
     VMOVE(point->pp_coord, cip->v);
     point->l.magic = WDB_PIPESEG_MAGIC;
     point->pp_od = cip->radius * 2;
     point->pp_id = (cip->radius - cip->thickness) * 2;
-    BU_LIST_APPEND(&pipe->pipe_segs_head, &point->l);
+    BU_LIST_APPEND(&pipep->pipe_segs_head, &point->l);
 
     BU_GET(point2, struct wdb_pipept);
     point2->pp_bendradius = 0.0;
@@ -1172,7 +1172,7 @@
     point2->l.magic = WDB_PIPESEG_MAGIC;
     point2->pp_od = cip->radius * 2;
     point2->pp_id = (cip->radius - cip->thickness) * 2;
-    BU_LIST_APPEND(&pipe->pipe_segs_head, &point2->l);
+    BU_LIST_APPEND(&pipep->pipe_segs_head, &point2->l);
 
     return 0;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.