From ea7b1d7484a3671a82f30ff7b31cf562edc9a909 Mon Sep 17 00:00:00 2001
From: "rhp%netscape.com" <rhp%netscape.com>
Date: Fri, 14 May 1999 22:24:26 +0000
Subject: [PATCH] Cleanup of code

---
 mailnews/mime/src/nsMimeURLUtils.cpp | 29 +++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/mailnews/mime/src/nsMimeURLUtils.cpp b/mailnews/mime/src/nsMimeURLUtils.cpp
index 0d0f5b94643a..4404333412bc 100644
--- a/mailnews/mime/src/nsMimeURLUtils.cpp
+++ b/mailnews/mime/src/nsMimeURLUtils.cpp
@@ -350,13 +350,29 @@ nsMimeURLUtils::URLType(const char *URL, PRInt32  *retType)
     return NS_OK;
 }
 
+PRBool
+ItMatches(const char *line, const char *rep)
+{
+  if ( (!rep) || (!*rep) || (!line) || (!*line) )
+    return PR_FALSE;
+
+  PRInt32 lineLen = PL_strlen(line);
+  PRInt32 compLen = PL_strlen(rep);
+
+  if (lineLen < compLen)
+    return PR_FALSE;
+
+  if (!PL_strncasecmp(line, rep, compLen))
+    return PR_TRUE;
+
+  return PR_FALSE;
+}
+
 PRBool
 GlyphHit(const char *line, char **outputHTML, PRInt32 *glyphTextLen)
 {
-  PRInt32 len = PL_strlen(line);
 
-  if ( ( (len >= 3) && (!PL_strncasecmp(line, ":-)", 3)) ) || 
-       ( (len >= 2) && (!PL_strncasecmp(line, ":)", 2)) ) )
+  if ( ItMatches(line, ":-)") || ItMatches(line, ":)") ) 
   {
     *outputHTML = PL_strdup("<img SRC=\"resource:/res/mailnews/messenger/smile.gif\" height=17 width=17 align=ABSCENTER>");
     if (!(*outputHTML))
@@ -364,8 +380,7 @@ GlyphHit(const char *line, char **outputHTML, PRInt32 *glyphTextLen)
     *glyphTextLen = 3;
     return PR_TRUE;
   }  
-  else if ( ( (len >= 3) && (!PL_strncasecmp(line, ":-(", 3)) ) ||
-            ( (len >= 2) && (!PL_strncasecmp(line, ":(", 2)) ) )
+  else if ( ItMatches(line, ":-(") || ItMatches(line, ":(") ) 
   {
     *outputHTML = PL_strdup("<img SRC=\"resource:/res/mailnews/messenger/frown.gif\" height=17 width=17 align=ABSCENTER>");
     if (!(*outputHTML))
@@ -373,7 +388,7 @@ GlyphHit(const char *line, char **outputHTML, PRInt32 *glyphTextLen)
     *glyphTextLen = 3;
     return PR_TRUE;
   }
-  else if ( (len >= 3) && (!PL_strncasecmp(line, ";-)", 3)) )
+  else if (ItMatches(line, ";-)"))
   {
     *outputHTML = PL_strdup("<img SRC=\"resource:/res/mailnews/messenger/wink.gif\" height=17 width=17 align=ABSCENTER>");
     if (!(*outputHTML))
@@ -381,7 +396,7 @@ GlyphHit(const char *line, char **outputHTML, PRInt32 *glyphTextLen)
     *glyphTextLen = 3;
     return PR_TRUE;
   }
-  else if ( (len >= 3) && (!PL_strncasecmp(line, ":-P", 3)) )
+  else if (ItMatches(line, ";-P"))
   {
     *outputHTML = PL_strdup("<img SRC=\"resource:/res/mailnews/messenger/sick.gif\" height=17 width=17 align=ABSCENTER>");
     if (!(*outputHTML))