[ofw] [PATCH] C++ style coding does not compile

[Smith, Stan]

Move C++ in-stream var declarations to top of {} block as in C style; Var assignments left in place.
MSFT compiler errors out with Missing ';' before 'type', 'Illegal use of this type osm_prefix_route_t as an expression'?


Signed-off-by: stan smith <stan.smith at intel.com>

diff --git a/opensm/opensm/osm_sa_path_record.c b/opensm/opensm/osm_sa_path_record.c
index 2247ebe..1166def 100644
--- a/opensm/opensm/osm_sa_path_record.c
+++ b/opensm/opensm/osm_sa_path_record.c
@@ -1214,6 +1214,10 @@ static ib_net16_t pr_rcv_get_end_points(IN osm_sa_t * sa,
                        if (!ib_gid_is_multicast(&p_pr->dgid) &&
                            ib_gid_get_subnet_prefix(&p_pr->dgid) !=
                            sa->p_subn->opt.subnet_prefix) {
+
+                               osm_prefix_route_t *route;
+                               osm_prefix_route_t *r;
+
                                OSM_LOG(sa->p_log, OSM_LOG_VERBOSE,
                                        "Non local DGID subnet prefix 0x%016"
                                        PRIx64 "\n",
@@ -1221,11 +1225,9 @@ static ib_net16_t pr_rcv_get_end_points(IN osm_sa_t * sa,

                                /* Find the router port that is configured to
                                   handle this prefix, if any */
-                               osm_prefix_route_t *route = NULL;
-                               osm_prefix_route_t *r = (osm_prefix_route_t *)
-                                   cl_qlist_head(&sa->p_subn->
-                                                 prefix_routes_list);
-
+                               route = NULL;
+                               r = (osm_prefix_route_t *) cl_qlist_head(
+                                       &sa->p_subn->prefix_routes_list);
                                while (r != (osm_prefix_route_t *)
                                       cl_qlist_end(&sa->p_subn->
                                                    prefix_routes_list)) {