Security-55471.14.4.tar.gz

[apple/security.git] / libsecurity_cdsa_utilities / lib / cssmdb.h

diff --git a/libsecurity_cdsa_utilities/lib/cssmdb.h b/libsecurity_cdsa_utilities/lib/cssmdb.h
index a8bf1dd334c94f355639bbaaf830d7eb85bf4c8a..f49fa48276845e7cda025f62e0553ce0ff00f5ee 100644 (file)
--- a/libsecurity_cdsa_utilities/lib/cssmdb.h
+++ b/libsecurity_cdsa_utilities/lib/cssmdb.h
@@ -214,7 +214,11 @@ class CssmDLPolyData
 {
 public:
        CssmDLPolyData(const CSSM_DATA &data, CSSM_DB_ATTRIBUTE_FORMAT format)
 {
 public:
        CssmDLPolyData(const CSSM_DATA &data, CSSM_DB_ATTRIBUTE_FORMAT format)

-       : mData(CssmData::overlay(data)), mFormat(format) {}
+       : mData(CssmData::overlay(data))
+#ifndef NDEBUG
+    , mFormat(format)
+#endif 
+    {}

 
        // @@@ Don't use assert, but throw an exception.
        // @@@ Do a size check on mData as well.
 
        // @@@ Don't use assert, but throw an exception.
        // @@@ Do a size check on mData as well.


@@ -260,7 +264,9 @@ public:
 
 private:
        const CssmData &mData;
 
 private:
        const CssmData &mData;

+#ifndef NDEBUG

        CSSM_DB_ATTRIBUTE_FORMAT mFormat;
        CSSM_DB_ATTRIBUTE_FORMAT mFormat;

+#endif

 };
 
 
 };
 
 


@@ -672,7 +678,8 @@ public:
     const CssmSubserviceUid &ssuid() const { return mImpl->ssuid(); }
     const char *dbName() const { return mImpl->dbName(); }
     const CssmNetAddress *dbLocation() const { return mImpl->dbLocation(); }
     const CssmSubserviceUid &ssuid() const { return mImpl->ssuid(); }
     const char *dbName() const { return mImpl->dbName(); }
     const CssmNetAddress *dbLocation() const { return mImpl->dbLocation(); }

-
+    bool IsImplEmpty() const {return mImpl == NULL;}
+    

     RefPointer<Impl> mImpl;
 };
 
     RefPointer<Impl> mImpl;
 };