From 2b0e25d7a290728d75fcb7c817453822fc427f50 Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Sat, 5 Feb 2005 00:49:25 +0000 Subject: [PATCH] Fix common misspelling of delimiter and delimited (de-limit-er, not deli-meter). b=106386 r=timeless git-svn-id: svn://10.0.0.236/trunk@168825 18797224-902f-48f8-a5cc-f745e15eee43 --- .../src/nsSchemaValidator.cpp | 28 +++++++++---------- .../plugin/base/src/nsPluginHostImpl.cpp | 2 +- .../SanePlugin/nsSanePluginControl.idl | 2 +- .../converters/nsUnknownDecoder.cpp | 2 +- mozilla/xpcom/io/nsLocalFileMac.cpp | 2 +- mozilla/xpinstall/packager/Packager.pm | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/mozilla/extensions/schema-validation/src/nsSchemaValidator.cpp b/mozilla/extensions/schema-validation/src/nsSchemaValidator.cpp index e896dafe57b..470479016da 100644 --- a/mozilla/extensions/schema-validation/src/nsSchemaValidator.cpp +++ b/mozilla/extensions/schema-validation/src/nsSchemaValidator.cpp @@ -941,12 +941,12 @@ PRBool nsSchemaValidator::IsValidSchemaGDay(const nsAString & aNodeValue, Schema char timezoneMinute[3] = ""; int dayInt; - char delimeter[4] = ""; - strncpy(delimeter, str.get(), 3); - delimeter[sizeof(delimeter)-1] = '\0'; + char delimiter[4] = ""; + strncpy(delimiter, str.get(), 3); + delimiter[sizeof(delimiter)-1] = '\0'; - // check for delimeter - if (strcmp(delimeter, "---") == 0) { + // check for delimiter + if (strcmp(delimiter, "---") == 0) { strncpy(day, str.get()+3, 2); day[sizeof(day)-1] = '\0'; @@ -1096,17 +1096,17 @@ PRBool nsSchemaValidator::IsValidSchemaGMonth(const nsAString & aNodeValue, int monthInt; NS_ConvertUTF16toUTF8 str(aNodeValue); - char delimeter[3] = ""; - strncpy(delimeter, str.get(), 2); - delimeter[sizeof(delimeter)-1] = '\0'; + char delimiter[3] = ""; + strncpy(delimiter, str.get(), 2); + delimiter[sizeof(delimiter)-1] = '\0'; - // check for the first |--| delimeter - if (strcmp(delimeter, "--") == 0) { - // check for the 2nd |--| delimeter - strncpy(delimeter, str.get()+4, 2); - delimeter[sizeof(delimeter)-1] = '\0'; + // check for the first |--| delimiter + if (strcmp(delimiter, "--") == 0) { + // check for the 2nd |--| delimiter + strncpy(delimiter, str.get()+4, 2); + delimiter[sizeof(delimiter)-1] = '\0'; - if (strcmp(delimeter, "--") == 0) + if (strcmp(delimiter, "--") == 0) isValid = PR_TRUE; } diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index 2cd97e70660..78aa5e62b9f 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -5769,7 +5769,7 @@ nsPluginHostImpl::AddHeadersToChannel(const char *aHeadersData, headersString = aHeadersData; // - // Iterate over the nsString: for each "\r\n" delimeted chunk, + // Iterate over the nsString: for each "\r\n" delimited chunk, // add the value as a header to the nsIHTTPChannel // diff --git a/mozilla/modules/plugin/samples/SanePlugin/nsSanePluginControl.idl b/mozilla/modules/plugin/samples/SanePlugin/nsSanePluginControl.idl index 0c427c34839..c983adecdfe 100644 --- a/mozilla/modules/plugin/samples/SanePlugin/nsSanePluginControl.idl +++ b/mozilla/modules/plugin/samples/SanePlugin/nsSanePluginControl.idl @@ -138,7 +138,7 @@ interface nsISanePluginInstance : nsISupports ////////////////////////////////////////////////////////////////////// // Generic SANE Interface - // READ_ONLY: returns a colon delimeted list of option descriptions + // READ_ONLY: returns a colon delimited list of option descriptions // where each option description is a comma delimited // list of values attribute string DeviceOptions; diff --git a/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp b/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp index 1df9090784d..98a90d1c254 100644 --- a/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp +++ b/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp @@ -300,7 +300,7 @@ nsUnknownDecoder::nsSnifferEntry nsUnknownDecoder::sSnifferEntries[] = { SNIFFER_ENTRY("%!PS-Adobe-", APPLICATION_POSTSCRIPT), SNIFFER_ENTRY("%! PS-Adobe-", APPLICATION_POSTSCRIPT), - // Files that start with mailbox delimeters let's provisionally call + // Files that start with mailbox delimiters let's provisionally call // text/plain SNIFFER_ENTRY("From", TEXT_PLAIN), SNIFFER_ENTRY(">From", TEXT_PLAIN), diff --git a/mozilla/xpcom/io/nsLocalFileMac.cpp b/mozilla/xpcom/io/nsLocalFileMac.cpp index 9d0e0e03929..989b711a611 100644 --- a/mozilla/xpcom/io/nsLocalFileMac.cpp +++ b/mozilla/xpcom/io/nsLocalFileMac.cpp @@ -1440,7 +1440,7 @@ nsLocalFile::GetNativeLeafName(nsACString &aLeafName) const char* leaf = strrchr(temp, ':'); - // if the working path is just a node without any directory delimeters. + // if the working path is just a node without any directory delimiters. if (leaf == nsnull) leaf = temp; else diff --git a/mozilla/xpinstall/packager/Packager.pm b/mozilla/xpinstall/packager/Packager.pm index 390e71a6051..0d617b4731f 100644 --- a/mozilla/xpinstall/packager/Packager.pm +++ b/mozilla/xpinstall/packager/Packager.pm @@ -288,7 +288,7 @@ sub do_copyfile chop($destpath); mkpath ($destpath, 0, 0755) || die "Error: mkpath() failed: $!. Exiting...\n"; - # Put delimeter back for copying... + # Put delimiter back for copying... $destpath = "$destpath$PD"; }