svn commit: r157748 - in httpd/apreq/branches/multi-env-unstable/library: cookie.c error.c

[joes]

Author: joes
Date: Wed Mar 16 05:38:38 2005
New Revision: 157748

URL: http://svn.apache.org/viewcvs?view=rev&rev=157748
Log:
Error code fixes.


Modified:
    httpd/apreq/branches/multi-env-unstable/library/cookie.c
    httpd/apreq/branches/multi-env-unstable/library/error.c

Modified: httpd/apreq/branches/multi-env-unstable/library/cookie.c
URL: 
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/cookie.c?view=diff&r1=157747&r2=157748
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/library/cookie.c (original)
+++ httpd/apreq/branches/multi-env-unstable/library/cookie.c Wed Mar 16 
05:38:38 2005
@@ -230,8 +230,8 @@
                 break;
             }
         }
-        /* bad attr: no terminating quote found */
-        return APREQ_ERROR_BADCHAR;
+        /* bad sequence: no terminating quote found */
+        return APREQ_ERROR_BADSEQ;
     }
     else {
         /* value is not wrapped in quotes */
@@ -318,7 +318,7 @@
 
         case '$':
             if (c == NULL) {
-                return APREQ_ERROR_BADSEQ;
+                return APREQ_ERROR_BADCHAR;
             }
             else if (version == NETSCAPE) {
                 return APREQ_ERROR_MISMATCH;

Modified: httpd/apreq/branches/multi-env-unstable/library/error.c
URL: 
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/error.c?view=diff&r1=157747&r2=157748
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/library/error.c (original)
+++ httpd/apreq/branches/multi-env-unstable/library/error.c Wed Mar 16 05:38:38 
2005
@@ -45,17 +45,11 @@
     case APREQ_ERROR_BADDATA:
         return "Malformed input data";
 
-    case APREQ_ERROR_BADSEQ:
-        return "Invalid byte sequence";
-
     case APREQ_ERROR_BADCHAR:
         return "Invalid character";
 
-    case APREQ_ERROR_NOTOKEN:
-        return "Expected token not present";
-
-    case APREQ_ERROR_BADTOKEN:
-        return "Invalid token";
+    case APREQ_ERROR_BADSEQ:
+        return "Invalid byte sequence";
 
     case APREQ_ERROR_BADATTR:
         return "Unrecognized attribute";
@@ -69,6 +63,9 @@
     case APREQ_ERROR_NODATA:
         return "Missing input data";
 
+    case APREQ_ERROR_NOTOKEN:
+        return "Expected token not present";
+
     case APREQ_ERROR_NOATTR:
         return "Missing attribute";
 
@@ -85,7 +82,7 @@
         return "Conflicting information";
 
     case APREQ_ERROR_OVERLIMIT:
-        return "Exceeds configured limit";
+        return "Exceeds configured maximum limit";
 
     case APREQ_ERROR_NOTEMPTY:
         return "Setting already configured";