diff options
| author | randomdan <randomdan@localhost> | 2012-07-09 18:26:22 +0000 |
|---|---|---|
| committer | randomdan <randomdan@localhost> | 2012-07-09 18:26:22 +0000 |
| commit | 0e0f221692006393417b2ce317edcdc8ee2542c2 (patch) | |
| tree | c3d6d7cb12ac00b53d3e251dd33cfa7a9cf71361 /project2/sql | |
| parent | Write sha1 hashes onto presenter cache files and validate client caches with ... (diff) | |
| download | project2-0e0f221692006393417b2ce317edcdc8ee2542c2.tar.bz2 project2-0e0f221692006393417b2ce317edcdc8ee2542c2.tar.xz project2-0e0f221692006393417b2ce317edcdc8ee2542c2.zip | |
Fixes suggested by cppcheck
Diffstat (limited to 'project2/sql')
| -rw-r--r-- | project2/sql/sqlBulkLoad.cpp | 3 | ||||
| -rw-r--r-- | project2/sql/sqlCache.cpp | 3 | ||||
| -rw-r--r-- | project2/sql/sqlMergeTask.cpp | 3 | ||||
| -rw-r--r-- | project2/sql/sqlTask.cpp | 3 | ||||
| -rw-r--r-- | project2/sql/sqlTest.cpp | 3 | ||||
| -rw-r--r-- | project2/sql/tablepatch.cpp | 2 |
6 files changed, 11 insertions, 6 deletions
diff --git a/project2/sql/sqlBulkLoad.cpp b/project2/sql/sqlBulkLoad.cpp index 227f06c..4d9604a 100644 --- a/project2/sql/sqlBulkLoad.cpp +++ b/project2/sql/sqlBulkLoad.cpp @@ -10,7 +10,8 @@ class SqlBulkLoad : public Task { Task(p), dataSource(p, "datasource"), targetTable(p, "targettable"), - extras(p, "extras") + extras(p, "extras"), + db(NULL) { p->script->loader.addLoadTarget(p, Storer::into<ElementLoader>(&stream)); } diff --git a/project2/sql/sqlCache.cpp b/project2/sql/sqlCache.cpp index 08d2831..7fe0408 100644 --- a/project2/sql/sqlCache.cpp +++ b/project2/sql/sqlCache.cpp @@ -22,7 +22,8 @@ typedef boost::shared_ptr<DB::ModifyCommand> ModifyPtr; class SqlCache : public Cache { public: SqlCache(ScriptNodePtr p) : - Cache(p) + Cache(p), + db(NULL) { } diff --git a/project2/sql/sqlMergeTask.cpp b/project2/sql/sqlMergeTask.cpp index 9611fa9..0b19c5e 100644 --- a/project2/sql/sqlMergeTask.cpp +++ b/project2/sql/sqlMergeTask.cpp @@ -24,7 +24,8 @@ class SqlMergeInsert : IHaveParameters, public Task { SqlMergeInsert(ScriptNodePtr p) : SourceObject(p), IHaveParameters(p), - Task(p) { + Task(p), + insert(NULL) { } void execute() const { unsigned int col = 0; diff --git a/project2/sql/sqlTask.cpp b/project2/sql/sqlTask.cpp index 852069d..03f67de 100644 --- a/project2/sql/sqlTask.cpp +++ b/project2/sql/sqlTask.cpp @@ -15,7 +15,8 @@ SqlTask::SqlTask(ScriptNodePtr p) : Task(p), dataSource(p, "datasource"), filter(p, "filter", ""), - sqlCommand(p->child("sql")) + sqlCommand(p->child("sql")), + db(NULL) { p->script->loader.addLoadTargetSub(p, "changes", false, Storer::into<ElementLoader>(&changesNOEs)); p->script->loader.addLoadTargetSub(p, "nochanges", false, Storer::into<ElementLoader>(&noChangesNOEs)); diff --git a/project2/sql/sqlTest.cpp b/project2/sql/sqlTest.cpp index 3cf25b7..f45b2c9 100644 --- a/project2/sql/sqlTest.cpp +++ b/project2/sql/sqlTest.cpp @@ -20,7 +20,8 @@ SqlTest::SqlTest(ScriptNodePtr p) : filter(p, "filter", ""), testOp(p, "testOp", "=="), testValue(p, "testValue"), - sqlCommand(p->child("sql")) + sqlCommand(p->child("sql")), + db(NULL) { } diff --git a/project2/sql/tablepatch.cpp b/project2/sql/tablepatch.cpp index 733f94f..8d61b66 100644 --- a/project2/sql/tablepatch.cpp +++ b/project2/sql/tablepatch.cpp @@ -39,7 +39,7 @@ TablePatch::addKey(const TablePatch::Column & c) void TablePatch::patch(const WhereProvider * where, const char * order) { - if (pk.size() == 0) { + if (pk.empty()) { throw PatchCheckFailure(); } if (doDelete) { |