diff src/scanner.cpp @ 244:ef97c7cd4a6e stable-6-0-27

const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
author Carl Byington <carl@five-ten-sg.com>
date Mon, 15 Aug 2011 21:08:11 -0700
parents c0d2e99c0a1d
children f92f24950bd3
line wrap: on
line diff
--- a/src/scanner.cpp	Fri Nov 19 13:04:47 2010 -0800
+++ b/src/scanner.cpp	Mon Aug 15 21:08:11 2011 -0700
@@ -140,7 +140,7 @@
     void push(u_char *buf, int len);
     void pusher();
     void validhost();
-    void error(char *err);
+    void error(const char *err);
 };
 
 
@@ -1235,7 +1235,7 @@
     memory = memory_;
 }
 
-void fsa::error(char *err) {
+void fsa::error(const char *err) {
     count = 0;
     st    = init;
     if (err) memory->syslog(err);
@@ -1253,9 +1253,9 @@
     if (!count) return; // empty string
     if (!strchr((const char *)pending, '@')) {
         // not an email address or message id
-        char *p1 = strchr((const char *)pending, '.');
-        char *p2 = strrchr((const char *)pending, '.');
-        char *p3 = strstr((const char *)pending, "..");
+        const char *p1 = strchr((const char *)pending, '.');
+        const char *p2 = strrchr((const char *)pending, '.');
+        const char *p3 = strstr((const char *)pending, "..");
         if (p1 && (p1 != (char*)pending) & !p3) {
             // have a period, so at least two components, and no empty components
             in_addr ip;
@@ -1354,7 +1354,7 @@
                     pending[--count] = '\0';  // null terminate host name by overwriting the terminator
                     // must start with protocol
                     if (strncasecmp((const char *)pending, "http", 4) == 0) {
-                        char *p = strrchr((const char *)pending, '/');
+                        const char *p = strrchr((const char *)pending, '/');
                         if (p) {
                             count = strlen(p+1);
                             memmove(pending, p+1, count+1);