From 786575c3deb269e5e7123adaa1d266859af7a2e8 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Mon, 5 Feb 2018 16:02:44 -0800
Subject: [PATCH] a little bit of cleanup and minor opt

---
 src/factory/FieldCreateFactory.cpp |  9 ++++-----
 src/pv/pvIntrospect.h              | 18 +++++++++---------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/factory/FieldCreateFactory.cpp b/src/factory/FieldCreateFactory.cpp
index b80eed0..1104a65 100644
--- a/src/factory/FieldCreateFactory.cpp
+++ b/src/factory/FieldCreateFactory.cpp
@@ -460,11 +460,10 @@ string Structure::getID() const
 }
 
 FieldConstPtr  Structure::getField(string const & fieldName) const {
-    size_t numberFields = fields.size();
-    for(size_t i=0; i<numberFields; i++) {
-        FieldConstPtr pfield = fields[i];
-        int result = fieldName.compare(fieldNames[i]);
-        if(result==0) return pfield;
+    for(size_t i=0, N=fields.size(); i<N; i++) {
+        if(fieldName==fieldNames[i]) {
+            return fields[i];
+        }
     }
     return FieldConstPtr();
 }
diff --git a/src/pv/pvIntrospect.h b/src/pv/pvIntrospect.h
index 30eb70f..384671b 100644
--- a/src/pv/pvIntrospect.h
+++ b/src/pv/pvIntrospect.h
@@ -570,7 +570,7 @@ public:
      * Get the introspection interface for the array elements.
      * @return The introspection interface.
      */
-    StructureConstPtr getStructure() const {return pstructure;}
+    const StructureConstPtr& getStructure() const {return pstructure;}
 
     virtual ArraySizeType getArraySizeType() const {return Array::variable;}
 
@@ -682,8 +682,8 @@ public:
     template<typename FT>
     std::tr1::shared_ptr<const FT> getField(std::string const &fieldName) const
     {
-        FieldConstPtr field = getField(fieldName);
-        if (field.get())
+        FieldConstPtr field(getField(fieldName));
+        if (field)
             return std::tr1::dynamic_pointer_cast<const FT>(field);
         else
             return std::tr1::shared_ptr<const FT>();
@@ -695,13 +695,13 @@ public:
      * @return The introspection interface.
      * This will hold a null pointer if the field is not in the structure.
      */
-    FieldConstPtr getField(std::size_t index) const {return fields.at(index);}
+    const FieldConstPtr& getField(std::size_t index) const {return fields.at(index);}
 
     template<typename FT>
     std::tr1::shared_ptr<const FT> getField(std::size_t index) const
     {
-        FieldConstPtr field = getField(index);
-        if (field.get())
+        const FieldConstPtr& field(getField(index));
+        if (field)
             return std::tr1::dynamic_pointer_cast<const FT>(field);
         else
             return std::tr1::shared_ptr<const FT>();
@@ -728,7 +728,7 @@ public:
      * @param fieldIndex The index of the desired field.
      * @return The fieldName.
      */
-    std::string getFieldName(std::size_t fieldIndex) const {return fieldNames.at(fieldIndex);}
+    const std::string& getFieldName(std::size_t fieldIndex) const {return fieldNames.at(fieldIndex);}
 
     virtual std::string getID() const;
 
@@ -804,7 +804,7 @@ public:
     std::tr1::shared_ptr<const FT> getField(std::string const &fieldName) const
     {
         FieldConstPtr field = getField(fieldName);
-        if (field.get())
+        if (field)
             return std::tr1::dynamic_pointer_cast<const FT>(field);
         else
             return std::tr1::shared_ptr<const FT>();
@@ -822,7 +822,7 @@ public:
     std::tr1::shared_ptr<const FT> getField(std::size_t index) const
     {
         FieldConstPtr field = getField(index);
-        if (field.get())
+        if (field)
             return std::tr1::dynamic_pointer_cast<const FT>(field);
         else
             return std::tr1::shared_ptr<const FT>();