corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Fixing ail bustage

Browse Source
This commit is contained in:
warren@netscape.com
2000-10-28 10:41:16 +00:00
parent 6c3f361ca6
commit da5f143ab2
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
layout/base/nsPresShell.cpp
View File

@@ -5406,9 +5406,8 @@ LogVerifyMessage(nsIFrame* k1, nsIFrame* k2, const char* aMsg)
else { else {
name.AssignWithConversion("(null)"); name.AssignWithConversion("(null)");
} }
PRINTF(NS_ConvertUCS2toUTF8(name)); const char* str = NS_ConvertUCS2toUTF8(name);
PRINTF("%s != ", str);
PRINTF(" != ");
if (nsnull != k2) { if (nsnull != k2) {
nsIFrameDebug* frameDebug; nsIFrameDebug* frameDebug;
@@ -5421,9 +5420,9 @@ LogVerifyMessage(nsIFrame* k1, nsIFrame* k2, const char* aMsg)
else { else {
name.AssignWithConversion("(null)"); name.AssignWithConversion("(null)");
} }
PRINTF(NS_ConvertUCS2toUTF8(name)); str = NS_ConvertUCS2toUTF8(name);
PRINTF(" %s", aMsg); PRINTF("%s %s", str, aMsg);
} }
static void static void
@@ -5438,7 +5437,8 @@ LogVerifyMessage(nsIFrame* k1, nsIFrame* k2, const char* aMsg,
(void**)&frameDebug))) { (void**)&frameDebug))) {
PRINTF(" "); PRINTF(" ");
frameDebug->GetFrameName(name); frameDebug->GetFrameName(name);
PRINTF("%s %p ", name, k1); nsCAutoString tmp; tmp.AssignWithConversion(name);
PRINTF("%s %p ", tmp.GetBuffer(), k1);
} }
PRINTF("{%d, %d, %d, %d}", r1.x, r1.y, r1.width, r1.height); PRINTF("{%d, %d, %d, %d}", r1.x, r1.y, r1.width, r1.height);
@@ -5448,7 +5448,8 @@ LogVerifyMessage(nsIFrame* k1, nsIFrame* k2, const char* aMsg,
(void**)&frameDebug))) { (void**)&frameDebug))) {
PRINTF(" "); PRINTF(" ");
frameDebug->GetFrameName(name); frameDebug->GetFrameName(name);
PRINTF("%s %p ", name, k2); nsCAutoString tmp; tmp.AssignWithConversion(name);
PRINTF("%s %p ", tmp.GetBuffer(), k2);
} }
PRINTF("{%d, %d, %d, %d}\n", r2.x, r2.y, r2.width, r2.height); PRINTF("{%d, %d, %d, %d}\n", r2.x, r2.y, r2.width, r2.height);
@@ -5678,14 +5679,16 @@ CompareTrees(nsIPresContext* aFirstPresContext, nsIFrame* aFirstFrame,
nsAutoString tmp; nsAutoString tmp;
if (nsnull != listName1) { if (nsnull != listName1) {
listName1->ToString(tmp); listName1->ToString(tmp);
PRINTF(NS_ConvertUCS2toUTF8(tmp)); const char* str = NS_ConvertUCS2toUTF8(tmp);
PRINTF(str);
} }
else else
PRINTF("(null)"); PRINTF("(null)");
PRINTF(" != "); PRINTF(" != ");
if (nsnull != listName2) { if (nsnull != listName2) {
listName2->ToString(tmp); listName2->ToString(tmp);
PRINTF(NS_ConvertUCS2toUTF8(tmp)); const char* str = NS_ConvertUCS2toUTF8(tmp);
PRINTF(str);
} }
else else
PRINTF("(null)"); PRINTF("(null)");

21
layout/html/base/src/nsPresShell.cpp
View File

@@ -5406,9 +5406,8 @@ LogVerifyMessage(nsIFrame* k1, nsIFrame* k2, const char* aMsg)
else { else {
name.AssignWithConversion("(null)"); name.AssignWithConversion("(null)");
} }
PRINTF(NS_ConvertUCS2toUTF8(name)); const char* str = NS_ConvertUCS2toUTF8(name);
PRINTF("%s != ", str);
PRINTF(" != ");
if (nsnull != k2) { if (nsnull != k2) {
nsIFrameDebug* frameDebug; nsIFrameDebug* frameDebug;
@@ -5421,9 +5420,9 @@ LogVerifyMessage(nsIFrame* k1, nsIFrame* k2, const char* aMsg)
else { else {
name.AssignWithConversion("(null)"); name.AssignWithConversion("(null)");
} }
PRINTF(NS_ConvertUCS2toUTF8(name)); str = NS_ConvertUCS2toUTF8(name);
PRINTF(" %s", aMsg); PRINTF("%s %s", str, aMsg);
} }
static void static void
@@ -5438,7 +5437,8 @@ LogVerifyMessage(nsIFrame* k1, nsIFrame* k2, const char* aMsg,
(void**)&frameDebug))) { (void**)&frameDebug))) {
PRINTF(" "); PRINTF(" ");
frameDebug->GetFrameName(name); frameDebug->GetFrameName(name);
PRINTF("%s %p ", name, k1); nsCAutoString tmp; tmp.AssignWithConversion(name);
PRINTF("%s %p ", tmp.GetBuffer(), k1);
} }
PRINTF("{%d, %d, %d, %d}", r1.x, r1.y, r1.width, r1.height); PRINTF("{%d, %d, %d, %d}", r1.x, r1.y, r1.width, r1.height);
@@ -5448,7 +5448,8 @@ LogVerifyMessage(nsIFrame* k1, nsIFrame* k2, const char* aMsg,
(void**)&frameDebug))) { (void**)&frameDebug))) {
PRINTF(" "); PRINTF(" ");
frameDebug->GetFrameName(name); frameDebug->GetFrameName(name);
PRINTF("%s %p ", name, k2); nsCAutoString tmp; tmp.AssignWithConversion(name);
PRINTF("%s %p ", tmp.GetBuffer(), k2);
} }
PRINTF("{%d, %d, %d, %d}\n", r2.x, r2.y, r2.width, r2.height); PRINTF("{%d, %d, %d, %d}\n", r2.x, r2.y, r2.width, r2.height);
@@ -5678,14 +5679,16 @@ CompareTrees(nsIPresContext* aFirstPresContext, nsIFrame* aFirstFrame,
nsAutoString tmp; nsAutoString tmp;
if (nsnull != listName1) { if (nsnull != listName1) {
listName1->ToString(tmp); listName1->ToString(tmp);
PRINTF(NS_ConvertUCS2toUTF8(tmp)); const char* str = NS_ConvertUCS2toUTF8(tmp);
PRINTF(str);
} }
else else
PRINTF("(null)"); PRINTF("(null)");
PRINTF(" != "); PRINTF(" != ");
if (nsnull != listName2) { if (nsnull != listName2) {
listName2->ToString(tmp); listName2->ToString(tmp);
PRINTF(NS_ConvertUCS2toUTF8(tmp)); const char* str = NS_ConvertUCS2toUTF8(tmp);
PRINTF(str);
} }
else else
PRINTF("(null)"); PRINTF("(null)");