Changeset 1191:bd35331c0e20

Timestamp:

03/23/09 10:33:00 (3 years ago)

Author:

niam

Branch:

default

Message:

constructors for internal data types

Files:

• trunk/src/cgiFastRequest.inline (modified) (1 diff)
• trunk/src/dataBaseMysql.cc (modified) (1 diff)
• trunk/src/dataBasePostgresql.cc (modified) (2 diffs)
• trunk/src/dataBaseSqlite.cc (modified) (3 diffs)
• trunk/src/dataFormatXmlProcessor.cc (modified) (13 diffs)
• trunk/src/graphicsImage.cc (modified) (1 diff)
• trunk/src/graphicsImage.inline (modified) (1 diff)
• trunk/src/ioNetworkSslExchange.cc (modified) (2 diffs)
• trunk/src/ioNetworkSslServer.cc (modified) (1 diff)
• trunk/src/ioSsl.inline (modified) (2 diffs)
• trunk/tests/dataformatxml_test/test.cc (modified) (1 diff)
• utils/shift_inline_comments.sh (modified) (1 prop)

trunk/src/cgiFastRequest.inline

@@ -45 +45 @@
                         struct __request
                         {
+                                /**
+                                 * constructor
+                                 */
+                                __request() : request(NULL)
+                                {
+                                }
+
                                 FCGX_Request *request; ///< fast-CGI request handler
                         };

trunk/src/dataBaseMysql.cc

@@ -49 +49 @@
                         struct __mysql
                         {
+                                /**
+                                 * constructor
+                                 */
+                                __mysql() : handle(NULL),
+                                                        result(NULL)
+                                {
+                                }
+
                                 MYSQL     *handle; ///< DB handle
                                 MYSQL_RES *result; ///< handle to result

trunk/src/dataBasePostgresql.cc

@@ -52 +52 @@
                         struct __postgresql
                         {
+                                /**
+                                 * constructor
+                                 */
+                                __postgresql() : handle(NULL),
+                                                                 result(NULL)
+                                {
+                                }
+
                                 PGconn *handle; ///< DB handle
                                 PGresult *result; ///< handlde to result
@@ -111 +119 @@
                                                    handle(new __postgresql)
 {
-        handle->handle = NULL;
-
 #ifndef DATABASE_WO_XEXEC
         collectedData.setExecObject(XEXEC_OBJECT_DATABASEPOSTGRESQL);

trunk/src/dataBaseSqlite.cc

@@ -50 +50 @@
                         struct __sqlite
                         {
+                                /**
+                                 * constructor
+                                 */
+                                __sqlite() : handle(NULL),
+                                                         result(NULL)
+                                {
+                                }
+
                                 sqlite3 *handle; ///< DB handle
                                 sqlite3_stmt *result; ///< handlde to result
@@ -62 +70 @@
                                    handle(new __sqlite)
 {
-        handle->handle = NULL;
-
 #ifndef DATABASE_WO_XEXEC
         collectedData.setExecObject(XEXEC_OBJECT_DATABASESQLITE);
@@ -74 +80 @@
                                                                                            handle(new __sqlite)
 {
-        handle->handle = NULL;
-
 #ifndef DATABASE_WO_XEXEC
         collectedData.setExecObject(XEXEC_OBJECT_DATABASESQLITE);

trunk/src/dataFormatXmlProcessor.cc

@@ -57 +57 @@
                                          * constructor
                                          */
-                                        __node()
+                                        __node() : node(NULL)
                                         {
                                         }
@@ -63 +63 @@
                                         /**
                                          * constructor
+                                         * @param node defines node handle to assign
                                          */
                                         __node(xmlNodePtr node) : node(node)
@@ -77 +78 @@
                                 struct __doc
                                 {
-                                        xmlDocPtr document; ///< represents internal libxml2 document data
+                                        /**
+                                         * constructor
+                                         */
+                                        __doc() : doc(NULL)
+                                        {
+                                        }
+
+                                        xmlDocPtr doc; ///< represents internal libxml2 document data
                                 };
                         };
@@ -174 +182 @@
 {
 #ifdef LIBXML2_EXT
-        xmlFreeDoc(document->document);
+        xmlFreeDoc(document->doc);
         xmlCleanupParser();
 
@@ -209 +217 @@
 {
 #ifdef LIBXML2_EXT
-        xmlFreeDoc(document->document);
-
-        document->document = xmlParseFile(file.c_str());
-        if (document->document == NULL)
+        xmlFreeDoc(document->doc);
+
+        document->doc = xmlParseFile(file.c_str());
+        if (document->doc == NULL)
         {
                 xmlErrorPtr error = xmlGetLastError();
@@ -237 +245 @@
 {
 #ifdef LIBXML2_EXT
-        xmlFreeDoc(document->document);
-
-        document->document = xmlParseMemory(buffer.c_str(), buffer.size());
-        if (document->document == NULL)
+        xmlFreeDoc(document->doc);
+
+        document->doc = xmlParseMemory(buffer.c_str(), buffer.size());
+        if (document->doc == NULL)
         {
                 xmlErrorPtr error = xmlGetLastError();
@@ -264 +272 @@
 {
 #ifdef LIBXML2_EXT
-        __node xnode = xmlDocGetRootElement(document->document);
+        __node xnode = xmlDocGetRootElement(document->doc);
         if (xnode.node == NULL)
         {
@@ -586 +594 @@
         }
 
-        unsigned char *xChar = xmlNodeListGetString(document->document, xnode.node->children, 1);
+        unsigned char *xChar = xmlNodeListGetString(document->doc, xnode.node->children, 1);
         if (xChar != NULL)
         {
@@ -734 +742 @@
 {
 #ifdef LIBXML2_EXT
-        xmlFreeDoc(document->document);
-
-        document->document = xmlParseFile(file.c_str());
-        if (document->document == NULL)
+        xmlFreeDoc(document->doc);
+
+        document->doc = xmlParseFile(file.c_str());
+        if (document->doc == NULL)
         {
                 xmlErrorPtr error = xmlGetLastError();
@@ -751 +759 @@
         }
 
-        xmlNodePtr xnode = xmlDocGetRootElement(document->document);
+        xmlNodePtr xnode = xmlDocGetRootElement(document->doc);
         if (xnode == NULL)
         {
@@ -778 +786 @@
 {
 #ifdef LIBXML2_EXT
-        xmlFreeDoc(document->document);
-
-        document->document = xmlParseMemory(buffer.c_str(), buffer.size());
-        if (document->document == NULL)
+        xmlFreeDoc(document->doc);
+
+        document->doc = xmlParseMemory(buffer.c_str(), buffer.size());
+        if (document->doc == NULL)
         {
                 xmlErrorPtr error = xmlGetLastError();
@@ -795 +803 @@
         }
 
-        xmlNodePtr xnode = xmlDocGetRootElement(document->document);
+        xmlNodePtr xnode = xmlDocGetRootElement(document->doc);
         if (xnode == NULL)
         {
@@ -890 +898 @@
 {
 #ifdef LIBXML2_EXT
-        xmlFreeDoc(document->document);
-        document->document = NULL;
+        xmlFreeDoc(document->doc);
+        document->doc = NULL;
 #endif
 }

trunk/src/graphicsImage.cc

@@ -242 +242 @@
 #endif
 {
-        collectedData.handle->im = NULL;
-
 #ifndef IMAGEMAGICK_PRE_63
         collectedData.handle->imInfo = AcquireImageInfo();

trunk/src/graphicsImage.inline

@@ -47 +47 @@
                 struct __image
                 {
+                        /**
+                         * contructor
+                         */
+                        __image() : im(NULL),
+                                                imInfo(NULL)
+                        {
+                        }
+
                         ImageInfo *imInfo; ///< image info handler
                         Image     *im;    ///< image handler

trunk/src/ioNetworkSslExchange.cc

@@ -51 +51 @@
                                                                          handle(new io::ssl::__sslConnection)
 {
-        handle->handle = NULL;
 }
 
@@ -94 +93 @@
         collectedData.setExecObject(XEXEC_OBJECT_IONETWORKSSLEXCHANGE);
 #endif
-
-        handle->handle = NULL;
 }
 

trunk/src/ioNetworkSslServer.cc

@@ -67 +67 @@
         collectedData.setExecObject(XEXEC_OBJECT_IONETWORKSSLSERVER);
 #endif
-
-        ctx->ctx = NULL;
 }
 

trunk/src/ioSsl.inline

@@ -45 +45 @@
                         struct __sslConnection
                         {
+                                /**
+                                 * constructor
+                                 */
+                                __sslConnection() : handle(NULL)
+                                {
+                                }
+
                                 SSL *handle;     ///< SSL connection handle
                         };
@@ -54 +61 @@
                         struct __sslContext
                         {
+                                /**
+                                 * constructor
+                                 */
+                                __sslContext() : ctx(NULL)
+                                {
+                                }
+
                                 SSL_CTX *ctx;    ///< SSL context
                         };

trunk/tests/dataformatxml_test/test.cc

@@ -7 +7 @@
 #include <libdodo/exceptionBasic.h>
 #include <libdodo/dataFormatXmlProcessor.h>
+#include <libdodo/dataFormatXmlNode.h>
 #include <libdodo/toolsMisc.h>