Bug 1393219 - Code clean-up: Style nits, typos and trailing spaces

Tag #1273

1 files changed, 3 insertions, 3 deletions

diff --git a/mailnews/base/util/nsMsgUtils.cpp b/mailnews/base/util/nsMsgUtils.cpp
index 0ed04cd47c..44609bea00 100644
--- a/mailnews/base/util/nsMsgUtils.cpp
+++ b/mailnews/base/util/nsMsgUtils.cpp
@@ -2506,15 +2506,15 @@ nsAutoCString MsgExtractQueryPart(nsAutoCString spec, const char* queryToExtract
   if (queryIndex == kNotFound)
     return queryPart;
 
-  int32_t queryEnd = Substring(spec, queryIndex + 1).FindChar('&');
+  int32_t queryEnd = spec.FindChar('&', queryIndex + 1);
   if (queryEnd == kNotFound)
-    queryEnd = Substring(spec, queryIndex + 1).FindChar('?');
+    queryEnd = spec.FindChar('?', queryIndex + 1);
   if (queryEnd == kNotFound) {
     // Nothing follows, so return from where the query qualifier started.
     queryPart.Assign(Substring(spec, queryIndex));
   } else {
     // Return the substring that represents the query qualifier.
-    queryPart.Assign(Substring(spec, queryIndex, queryEnd + 1));
+    queryPart.Assign(Substring(spec, queryIndex, queryEnd - queryIndex));
   }
   return queryPart;
 }