diff src/routeconfig.h @ 4:180d26aa2a17

Fedora 9 compile and const correctness.
author Carl Byington <carl@five-ten-sg.com>
date Thu, 12 Jun 2008 17:51:33 -0700
parents 48d06780cf77
children
line wrap: on
line diff
--- a/src/routeconfig.h	Thu May 22 20:39:52 2008 -0700
+++ b/src/routeconfig.h	Thu Jun 12 17:51:33 2008 -0700
@@ -15,15 +15,15 @@
 
 class PATTERN {
     pattern_style   style;
-    char *          pattern;    // owned by the string table
+    const char *    pattern;    // owned by the string table
     regex_t         re;
     int             index1;     // zero based substring of the regex match that contains the as list or prefix value
     int             index2;     // zero based substring of the regex match that contains the prefix length
 public:
     ~PATTERN();
-    PATTERN(TOKEN &tok, pattern_style style_, char *pattern_, int index1_, int index2_);
-    bool    process(char *buf, CONFIG &con, char *file_name, int pattern_index);
-    void    dump(int level, int index, char *token);
+    PATTERN(TOKEN &tok, pattern_style style_, const char *pattern_, int index1_, int index2_);
+    bool    process(char *buf, CONFIG &con, const char *file_name, int pattern_index);
+    void    dump(int level, int index, const char *token);
     void    dump(int level);
 };
 
@@ -35,14 +35,14 @@
 
 class ROUTECONFIG {
     TOKEN *         tokp;
-    char *          file_name;  // name of the syslog file
+    const char *    file_name;  // name of the syslog file
     pattern_list    patterns;   // owns the patterns
     int             fd;
     struct stat     openfdstat;
     int             len;        // bytes in the buffer
     char            buf[buflen];
 public:
-    ROUTECONFIG(TOKEN &tok, char *file_name_);
+    ROUTECONFIG(TOKEN &tok, const char *file_name_);
     ~ROUTECONFIG();
     bool    failed()    { return (fd == -1); };
     void    open(bool msg);
@@ -71,27 +71,27 @@
 };
 
 void        discard(string_set &s);
-char*       register_string(string_set &s, char *name);
-char*       register_string(char *name);
+const char* register_string(string_set &s, const char *name);
+const char* register_string(const char *name);
 void        clear_strings();
 void        clear_rib();
-int         ip_address(char *have);
-bool        load_conf(CONFIG &dc, char *fn);
+int         ip_address(const char *have);
+bool        load_conf(CONFIG &dc, const char *fn);
 void        routing_hourly_update();
 void        token_init();
 
-extern char *token_announce_aslist_index;
-extern char *token_announce_pattern;
-extern char *token_announce_prelen_index;
-extern char *token_announce_preval_index;
-extern char *token_file;
-extern char *token_include;
-extern char *token_lbrace;
-extern char *token_rbrace;
-extern char *token_semi;
-extern char *token_slash;
-extern char *token_withdraw_aslist_index;
-extern char *token_withdraw_pattern;
-extern char *token_withdraw_prelen_index;
-extern char *token_withdraw_preval_index;
+extern const char *token_announce_aslist_index;
+extern const char *token_announce_pattern;
+extern const char *token_announce_prelen_index;
+extern const char *token_announce_preval_index;
+extern const char *token_file;
+extern const char *token_include;
+extern const char *token_lbrace;
+extern const char *token_rbrace;
+extern const char *token_semi;
+extern const char *token_slash;
+extern const char *token_withdraw_aslist_index;
+extern const char *token_withdraw_pattern;
+extern const char *token_withdraw_prelen_index;
+extern const char *token_withdraw_preval_index;