Changeset 1580 for trunk/src

Timestamp:

Oct 13, 2009, 3:57:07 PM (15 years ago)

Author:

gah

Message:

 

Location:

trunk/src/core

Files:

• RpEncode.cc (modified) (2 diffs)
• RpEntityRef.cc (modified) (3 diffs)

trunk/src/core/RpEncode.cc

@@ -191 +191 @@
         size = strlen(buf);
     }
-    const char *cp, *endPtr;
-    for (cp = buf, endPtr = cp + size; cp < endPtr; 
-         cp++) {
-        if (!_xmlchars[(unsigned int)*cp]) {
+    unsigned const char *p, *pend;
+    for (p = (unsigned const char *)buf, pend = p + size; p < pend; p++) {
+        if (!_xmlchars[*p]) {
             return true;                
         }
@@ -210 +209 @@
         size = strlen(buf);
     }
-    const char *cp, *endPtr;
-    for (cp = buf, endPtr = buf + size; cp < endPtr; cp++) {
-        if (!_base64chars[(unsigned int)*cp]) {
-            fprintf(stderr, "%c %d is not base64\n", *cp, *cp);
+    unsigned const char *p, *pend;
+    for (p = (unsigned const char *)buf, pend = p + size; p < pend; p++) {
+        if (!_base64chars[*p]) {
+            fprintf(stderr, "%c %u is not base64\n", *p, *p);
             return false;
         }

trunk/src/core/RpEntityRef.cc

@@ -23 +23 @@
  *        &lt;           "<"
  *        &gt;           ">"
- *        &quot          "\""
- *        &apos          "'"
+ *        &quot;         "\""
+ *        &apos;         "'"
  *
  */
@@ -42 +42 @@
 
 static PredefEntityRef predef[] = {
-    { "&quot",  5,  "\"" },
-    { "&amp",   4,  "&"  },
-    { "&lt",    3,  "<"  },
-    { "&gt",    3,  ">"  },
-    { "&apos",  5,  "'"  }
+    { "&quot;",  6,  "\"" },
+    { "&amp;",   5,  "&"  },
+    { "&lt;",    4,  "<"  },
+    { "&gt;",    4,  ">"  },
+    { "&apos;",  6,  "'"  }
 };
 static int nPredefs = sizeof(predef) / sizeof (PredefEntityRef);
@@ -107 +107 @@
 EntityRef::encode (const char* string, unsigned int len)
 {
-    unsigned int pos = 0;
-
     if (string == NULL) {
-        // Don't do anything with NULL strings.
-        return NULL;
+        return NULL;                   /* Don't do anything with NULL
+                                        * strings. */
     }
     _bout.clear();