Follow-up to bug 515583 -- s/ParseFTPListDetermineRetval/ParsingFailure/
authorReed Loden <reed@reedloden.com>
Tue, 22 Sep 2009 22:40:21 -0500
changeset 32978 cade5b705114
parent 32977 98330c8132a9
child 32979 054085b0a7db
push id9269
push userreed@reedloden.com
push date2009-09-23 03:40 +0000
treeherdermozilla-central@cade5b705114 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs515583
milestone1.9.3a1pre
Follow-up to bug 515583 -- s/ParseFTPListDetermineRetval/ParsingFailure/
netwerk/streamconv/converters/ParseFTPList.cpp
--- a/netwerk/streamconv/converters/ParseFTPList.cpp
+++ b/netwerk/streamconv/converters/ParseFTPList.cpp
@@ -41,17 +41,17 @@
 #include <ctype.h>
 #include "plstr.h"
 #include "nsDebug.h"
 
 #include "ParseFTPList.h"
 
 /* ==================================================================== */
 
-static inline int ParseFTPListDetermineRetval(struct list_state *state)
+static inline int ParsingFailed(struct list_state *state)
 {
   if (state->parsed_one || state->lstyle) /* junk if we fail to parse */
     return '?';      /* this time but had previously parsed successfully */
   return '"';        /* its part of a comment or error message */
 }
 
 int ParseFTPList(const char *line, struct list_state *state,
                  struct list_result *result )
@@ -127,17 +127,17 @@ int ParseFTPList(const char *line, struc
         {
           toklen[numtoks] = (&line[pos] - tokens[numtoks]);
           numtoks++;  
         }
       }
     }    
 
     if (!numtoks)
-      return ParseFTPListDetermineRetval(state);
+      return ParsingFailed(state);
 
     linelen_sans_wsp = &(tokens[numtoks-1][toklen[numtoks-1]]) - tokens[0];
     if (numtoks == (sizeof(tokens)/sizeof(tokens[0])) )
     {
       pos = linelen;
       while (pos > 0 && (line[pos-1] == ' ' || line[pos-1] == '\t'))
         pos--;
       linelen_sans_wsp = pos;
@@ -1695,17 +1695,17 @@ int ParseFTPList(const char *line, struc
       } /* if (lstyle == 'D') */
     } /* if (!lstyle && (!state->lstyle || state->lstyle == 'D')) */
 #endif
 
     /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
 
   } /* if (linelen > 0) */
 
-  return ParseFTPListDetermineRetval(state);
+  return ParsingFailed(state);
 }
 
 /* ==================================================================== */
 /* standalone testing                                                   */
 /* ==================================================================== */
 #if 0
 
 #include <stdio.h>