Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing bug 232503. Start using Empty[C]String() to save a bit on code-size. r+sr=peterv@propagandism.org

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@152045 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%mozilla.jstenback.com
2004-01-29 22:04:45 +00:00
parent a4fdb69d95
commit 6629ad58f7
107 changed files with 299 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/extensions/sql/base/src/mozSqlService.cpp
View File

@@ -340,9 +340,8 @@ mozSqlService::GetNewConnection(nsIRDFResource* aAlias, mozISqlConnection **_ret
if (NS_FAILED(rv))
return rv;
nsCAutoString contractID(
NS_LITERAL_CSTRING("@mozilla.org/sql/connection;1?type=") +
NS_ConvertUCS2toUTF8(type));
nsCAutoString contractID("@mozilla.org/sql/connection;1?type=");
AppendUTF16toUTF8(type, contractID);
nsCOMPtr<mozISqlConnection> conn = do_CreateInstance(contractID.get());
if (! conn)

11
mozilla/extensions/sql/pgsql/src/mozSqlConnectionPgsql.cpp
View File

@@ -81,7 +81,7 @@ nsresult
mozSqlConnectionPgsql::Setup()
{
if (PQstatus(mConnection) == CONNECTION_BAD) {
mErrorMessage.Assign(NS_ConvertUTF8toUCS2(PQerrorMessage(mConnection)));
CopyUTF8toUTF16(PQerrorMessage(mConnection), mErrorMessage);
mConnection = nsnull;
return NS_ERROR_FAILURE;
}
@@ -93,6 +93,7 @@ mozSqlConnectionPgsql::Setup()
PRInt32 stat = PQresultStatus(result);
if (stat != PGRES_COMMAND_OK) {
mErrorMessage.Assign(NS_ConvertUTF8toUCS2(PQresultErrorMessage(result)));
CopyUTF8toUTF16(PQresultErrorMessage(result), mErrorMessage);
PQfinish(mConnection);
mConnection = nsnull;
return NS_ERROR_FAILURE;
@@ -102,7 +103,7 @@ mozSqlConnectionPgsql::Setup()
PGresult* result = PQexec(mConnection, "select version()");
PRInt32 stat = PQresultStatus(result);
if (stat != PGRES_TUPLES_OK) {
mErrorMessage.Assign(NS_ConvertUTF8toUCS2(PQresultErrorMessage(result)));
CopyUTF8toUTF16(PQresultErrorMessage(result), mErrorMessage);
return NS_ERROR_FAILURE;
}
char* version = PQgetvalue(result, 0, 0);
@@ -185,7 +186,7 @@ mozSqlConnectionPgsql::RealExec(const nsAString& aQuery,
free(query);
stat = PQresultStatus(types);
if (stat != PGRES_TUPLES_OK) {
mErrorMessage.Assign(NS_ConvertUTF8toUCS2(PQresultErrorMessage(types)));
CopyUTF8toUTF16(PQresultErrorMessage(types), mErrorMessage);
return NS_ERROR_FAILURE;
}
@@ -214,7 +215,7 @@ mozSqlConnectionPgsql::RealExec(const nsAString& aQuery,
mLastID = PQoidValue(r);
}
else {
mErrorMessage.Assign(NS_ConvertUTF8toUCS2(PQresultErrorMessage(r)));
CopyUTF8toUTF16(PQresultErrorMessage(r), mErrorMessage);
return NS_ERROR_FAILURE;
}
@@ -225,7 +226,7 @@ nsresult
mozSqlConnectionPgsql::CancelExec()
{
if (!PQrequestCancel(mConnection)) {
mErrorMessage.Assign(NS_ConvertUTF8toUCS2(PQerrorMessage(mConnection)));
CopyUTF8toUTF16(PQerrorMessage(mConnection), mErrorMessage);
return NS_ERROR_FAILURE;
}

4
mozilla/extensions/sql/pgsql/src/mozSqlResultPgsql.cpp
View File

@@ -72,7 +72,7 @@ mozSqlResultPgsql::BuildColumnInfo()
{
for (PRInt32 i = 0; i < PQnfields(mResult); i++) {
char* n = PQfname(mResult, i);
PRUnichar* name = ToNewUnicode(NS_ConvertUTF8toUCS2(n));
PRUnichar* name = UTF8ToNewUnicode(n);
PRInt32 type = GetColType(i);
PRInt32 size = PQfsize(mResult, i);
PRInt32 mod = PQfmod(mResult, i);
@@ -106,7 +106,7 @@ mozSqlResultPgsql::BuildRows()
cell->SetNull(PR_FALSE);
PRInt32 type = cell->GetType();
if (type == mozISqlResult::TYPE_STRING)
cell->SetString(ToNewUnicode(NS_ConvertUTF8toUCS2(value)));
cell->SetString(UTF8ToNewUnicode(value));
else if (type == mozISqlResult::TYPE_INT)
PR_sscanf(value, "%d", &cell->mInt);
else if (type == mozISqlResult::TYPE_FLOAT)