From 1dc84bd010538c8ff8588ed1ccff06358f34dbce Mon Sep 17 00:00:00 2001 From: "peterl%netscape.com" Date: Sun, 27 Jun 1999 21:17:39 +0000 Subject: [PATCH] removed autostring constructor usage per rickg cleaned up url listing git-svn-id: svn://10.0.0.236/trunk@37144 18797224-902f-48f8-a5cc-f745e15eee43 --- .../html/style/src/nsHTMLCSSStyleSheet.cpp | 24 ++++++++++--------- .../html/style/src/nsHTMLStyleSheet.cpp | 24 ++++++++++--------- .../html/style/src/nsHTMLCSSStyleSheet.cpp | 24 ++++++++++--------- .../html/style/src/nsHTMLStyleSheet.cpp | 24 ++++++++++--------- mozilla/layout/style/nsHTMLCSSStyleSheet.cpp | 24 ++++++++++--------- mozilla/layout/style/nsHTMLStyleSheet.cpp | 24 ++++++++++--------- 6 files changed, 78 insertions(+), 66 deletions(-) diff --git a/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp index 5d223765837..7a6e02215db 100644 --- a/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp +++ b/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp @@ -630,20 +630,22 @@ void HTMLCSSStyleSheetImpl::List(FILE* out, PRInt32 aIndent) const fputs("HTML CSS Style Sheet: ", out); #ifdef NECKO - char* buffer; - mURL->GetSpec(&buffer); + char* urlSpec = nsnull; + mURL->GetSpec(&urlSpec); + if (urlSpec) { + fputs(urlSpec, out); + nsCRT::free(urlSpec); + } #else - PRUnichar* buffer; - mURL->ToString(&buffer); + PRUnichar* urlSpec = nsnull; + mURL->ToString(&urlSpec); + if (urlSpec) { + nsAutoString buffer(urlSpec); + fputs(buffer, out); + delete [] urlSpec; + } #endif - nsAutoString as(buffer,0); - fputs(as, out); fputs("\n", out); -#ifdef NECKO - nsCRT::free(buffer); -#else - delete buffer; -#endif } diff --git a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp index a450e919bf9..0bf52a8af2b 100644 --- a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp +++ b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp @@ -1109,20 +1109,22 @@ void HTMLStyleSheetImpl::List(FILE* out, PRInt32 aIndent) const fputs("HTML Style Sheet: ", out); #ifdef NECKO - char* buffer; - mURL->GetSpec(&buffer); + char* urlSpec = nsnull; + mURL->GetSpec(&urlSpec); + if (urlSpec) { + fputs(urlSpec, out); + nsCRT::free(urlSpec); + } #else - PRUnichar* buffer; - mURL->ToString(&buffer); + PRUnichar* urlSpec = nsnull; + mURL->ToString(&urlSpec); + if (urlSpec) { + nsAutoString buffer(urlSpec); + fputs(buffer, out); + delete [] urlSpec; + } #endif - nsAutoString as(buffer,0); - fputs(as, out); fputs("\n", out); -#ifdef NECKO - nsCRT::free(buffer); -#else - delete buffer; -#endif } diff --git a/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp b/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp index 5d223765837..7a6e02215db 100644 --- a/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp +++ b/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp @@ -630,20 +630,22 @@ void HTMLCSSStyleSheetImpl::List(FILE* out, PRInt32 aIndent) const fputs("HTML CSS Style Sheet: ", out); #ifdef NECKO - char* buffer; - mURL->GetSpec(&buffer); + char* urlSpec = nsnull; + mURL->GetSpec(&urlSpec); + if (urlSpec) { + fputs(urlSpec, out); + nsCRT::free(urlSpec); + } #else - PRUnichar* buffer; - mURL->ToString(&buffer); + PRUnichar* urlSpec = nsnull; + mURL->ToString(&urlSpec); + if (urlSpec) { + nsAutoString buffer(urlSpec); + fputs(buffer, out); + delete [] urlSpec; + } #endif - nsAutoString as(buffer,0); - fputs(as, out); fputs("\n", out); -#ifdef NECKO - nsCRT::free(buffer); -#else - delete buffer; -#endif } diff --git a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp index a450e919bf9..0bf52a8af2b 100644 --- a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp +++ b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp @@ -1109,20 +1109,22 @@ void HTMLStyleSheetImpl::List(FILE* out, PRInt32 aIndent) const fputs("HTML Style Sheet: ", out); #ifdef NECKO - char* buffer; - mURL->GetSpec(&buffer); + char* urlSpec = nsnull; + mURL->GetSpec(&urlSpec); + if (urlSpec) { + fputs(urlSpec, out); + nsCRT::free(urlSpec); + } #else - PRUnichar* buffer; - mURL->ToString(&buffer); + PRUnichar* urlSpec = nsnull; + mURL->ToString(&urlSpec); + if (urlSpec) { + nsAutoString buffer(urlSpec); + fputs(buffer, out); + delete [] urlSpec; + } #endif - nsAutoString as(buffer,0); - fputs(as, out); fputs("\n", out); -#ifdef NECKO - nsCRT::free(buffer); -#else - delete buffer; -#endif } diff --git a/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp b/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp index 5d223765837..7a6e02215db 100644 --- a/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp +++ b/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp @@ -630,20 +630,22 @@ void HTMLCSSStyleSheetImpl::List(FILE* out, PRInt32 aIndent) const fputs("HTML CSS Style Sheet: ", out); #ifdef NECKO - char* buffer; - mURL->GetSpec(&buffer); + char* urlSpec = nsnull; + mURL->GetSpec(&urlSpec); + if (urlSpec) { + fputs(urlSpec, out); + nsCRT::free(urlSpec); + } #else - PRUnichar* buffer; - mURL->ToString(&buffer); + PRUnichar* urlSpec = nsnull; + mURL->ToString(&urlSpec); + if (urlSpec) { + nsAutoString buffer(urlSpec); + fputs(buffer, out); + delete [] urlSpec; + } #endif - nsAutoString as(buffer,0); - fputs(as, out); fputs("\n", out); -#ifdef NECKO - nsCRT::free(buffer); -#else - delete buffer; -#endif } diff --git a/mozilla/layout/style/nsHTMLStyleSheet.cpp b/mozilla/layout/style/nsHTMLStyleSheet.cpp index a450e919bf9..0bf52a8af2b 100644 --- a/mozilla/layout/style/nsHTMLStyleSheet.cpp +++ b/mozilla/layout/style/nsHTMLStyleSheet.cpp @@ -1109,20 +1109,22 @@ void HTMLStyleSheetImpl::List(FILE* out, PRInt32 aIndent) const fputs("HTML Style Sheet: ", out); #ifdef NECKO - char* buffer; - mURL->GetSpec(&buffer); + char* urlSpec = nsnull; + mURL->GetSpec(&urlSpec); + if (urlSpec) { + fputs(urlSpec, out); + nsCRT::free(urlSpec); + } #else - PRUnichar* buffer; - mURL->ToString(&buffer); + PRUnichar* urlSpec = nsnull; + mURL->ToString(&urlSpec); + if (urlSpec) { + nsAutoString buffer(urlSpec); + fputs(buffer, out); + delete [] urlSpec; + } #endif - nsAutoString as(buffer,0); - fputs(as, out); fputs("\n", out); -#ifdef NECKO - nsCRT::free(buffer); -#else - delete buffer; -#endif }