[darwinbuild-changes] [680] branches/PR-7489777/darwinup

[source_changes at macosforge.org]

Revision: 680
          http://trac.macosforge.org/projects/darwinbuild/changeset/680
Author:   wsiegrist at apple.com
Date:     2010-01-29 17:14:02 -0800 (Fri, 29 Jan 2010)
Log Message:
-----------
Fix constructors

Modified Paths:
--------------
    branches/PR-7489777/darwinup/Column.cpp
    branches/PR-7489777/darwinup/Table.cpp

Modified: branches/PR-7489777/darwinup/Column.cpp
===================================================================
--- branches/PR-7489777/darwinup/Column.cpp	2010-01-30 01:06:14 UTC (rev 679)
+++ branches/PR-7489777/darwinup/Column.cpp	2010-01-30 01:14:02 UTC (rev 680)
@@ -35,11 +35,19 @@
 #include "Column.h"
 
 Column::Column() {
-	Column("unnamed_column", SQLITE_INTEGER);
+	m_name      = strdup("unnamed_column");
+	m_type      = SQLITE_INTEGER;
+	m_is_index  = false;
+	m_is_pk     = false;
+	m_is_unique = false;
 }
 
 Column::Column(const char* name, uint32_t type) {
-	Column(name, type, false, false, false);
+	m_name      = strdup(name);
+	m_type      = type;
+	m_is_index  = false;
+	m_is_pk     = false;
+	m_is_unique = false;
 }
 
 Column::Column(const char* name, uint32_t type, bool is_index, bool is_pk, bool is_unique) {

Modified: branches/PR-7489777/darwinup/Table.cpp
===================================================================
--- branches/PR-7489777/darwinup/Table.cpp	2010-01-30 01:06:14 UTC (rev 679)
+++ branches/PR-7489777/darwinup/Table.cpp	2010-01-30 01:14:02 UTC (rev 680)
@@ -40,12 +40,14 @@
 	m_column_max    = 1;
 	m_column_count  = 0;
 	m_columns       = (Column**)malloc(sizeof(Column*) * m_column_max);
-	m_name          = NULL;
+	m_name          = strdup("unnamed_table");
 }
 
 Table::Table(const char* name) {
-	Table();
-	m_name = strdup(name);
+	m_column_max    = 1;
+	m_column_count  = 0;
+	m_columns       = (Column**)malloc(sizeof(Column*) * m_column_max);
+	m_name          = strdup(name);
 }
 
 Table::~Table() {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20100129/8371156e/attachment.html>