const char *

(Logical change 1.6)

diff --git a/lib/utils.c b/lib/utils.c
index 6763be2a737315e347b04f9658092cb70c743667..90a0ef20e0e9ba3e2d653fdb64675ceb65c3d39d 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -29,7 +29,7 @@
 
 #include "utils.h"
 
-int get_integer(int *val, char *arg, int base)
+int get_integer(int *val, const char *arg, int base)
 {
        long res;
        char *ptr;
@@ -43,7 +43,7 @@ int get_integer(int *val, char *arg, int base)
        return 0;
 }
 
-int get_unsigned(unsigned *val, char *arg, int base)
+int get_unsigned(unsigned *val, const char *arg, int base)
 {
        unsigned long res;
        char *ptr;
@@ -57,7 +57,7 @@ int get_unsigned(unsigned *val, char *arg, int base)
        return 0;
 }
 
-int get_u32(__u32 *val, char *arg, int base)
+int get_u32(__u32 *val, const char *arg, int base)
 {
        unsigned long res;
        char *ptr;
@@ -71,7 +71,7 @@ int get_u32(__u32 *val, char *arg, int base)
        return 0;
 }
 
-int get_u16(__u16 *val, char *arg, int base)
+int get_u16(__u16 *val, const char *arg, int base)
 {
        unsigned long res;
        char *ptr;
@@ -85,7 +85,7 @@ int get_u16(__u16 *val, char *arg, int base)
        return 0;
 }
 
-int get_u8(__u8 *val, char *arg, int base)
+int get_u8(__u8 *val, const char *arg, int base)
 {
        unsigned long res;
        char *ptr;
@@ -99,7 +99,7 @@ int get_u8(__u8 *val, char *arg, int base)
        return 0;
 }
 
-int get_s16(__s16 *val, char *arg, int base)
+int get_s16(__s16 *val, const char *arg, int base)
 {
        long res;
        char *ptr;
@@ -113,7 +113,7 @@ int get_s16(__s16 *val, char *arg, int base)
        return 0;
 }
 
-int get_s8(__s8 *val, char *arg, int base)
+int get_s8(__s8 *val, const char *arg, int base)
 {
        long res;
        char *ptr;
@@ -127,9 +127,9 @@ int get_s8(__s8 *val, char *arg, int base)
        return 0;
 }
 
-int get_addr_1(inet_prefix *addr, char *name, int family)
+int get_addr_1(inet_prefix *addr, const char *name, int family)
 {
-       char *cp;
+       const char *cp;
        unsigned char *ap = (unsigned char*)addr->data;
        int i;
 
@@ -270,31 +270,31 @@ __u32 get_addr32(char *name)
        return addr.data[0];
 }
 
-void incomplete_command()
+void incomplete_command(void)
 {
        fprintf(stderr, "Command line is not complete. Try option \"help\"\n");
        exit(-1);
 }
 
-void invarg(char *msg, char *arg)
+void invarg(const char *msg, const char *arg)
 {
        fprintf(stderr, "Error: argument \"%s\" is wrong: %s\n", arg, msg);
        exit(-1);
 }
 
-void duparg(char *key, char *arg)
+void duparg(const char *key, const char *arg)
 {
        fprintf(stderr, "Error: duplicate \"%s\": \"%s\" is the second value.\n", key, arg);
        exit(-1);
 }
 
-void duparg2(char *key, char *arg)
+void duparg2(const char *key, const char *arg)
 {
        fprintf(stderr, "Error: either \"%s\" is duplicate, or \"%s\" is a garbage.\n", key, arg);
        exit(-1);
 }
 
-int matches(char *cmd, char *pattern)
+int matches(const char *cmd, const char *pattern)
 {
        int len = strlen(cmd);
        if (len > strlen(pattern))
@@ -302,7 +302,7 @@ int matches(char *cmd, char *pattern)
        return memcmp(pattern, cmd, len);
 }
 
-int inet_addr_match(inet_prefix *a, inet_prefix *b, int bits)
+int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits)
 {
        __u32 *a1 = a->data;
        __u32 *a2 = b->data;
@@ -362,7 +362,7 @@ int __get_hz(void)
        return HZ;
 }
 
-const char *rt_addr_n2a(int af, int len, void *addr, char *buf, int buflen)
+const char *rt_addr_n2a(int af, int len, const void *addr, char *buf, int buflen)
 {
        switch (af) {
        case AF_INET:
@@ -391,7 +391,7 @@ struct namerec
 
 static struct namerec *nht[256];
 
-char *resolve_address(char *addr, int len, int af)
+char *resolve_address(const char *addr, int len, int af)
 {
        struct namerec *n;
        struct hostent *h_ent;
@@ -426,7 +426,7 @@ char *resolve_address(char *addr, int len, int af)
                sethostent(1);
        fflush(stdout);
 
-       if ((h_ent = gethostbyaddr(addr, len, af)) != NULL)
+       if ((h_ent = gethostbyaddr(addr, len, af)) != NULL) 
                n->name = strdup(h_ent->h_name);
 
        /* Even if we fail, "negative" entry is remembered. */
@@ -435,7 +435,8 @@ char *resolve_address(char *addr, int len, int af)
 #endif
 
 
-const char *format_host(int af, int len, void *addr, char *buf, int buflen)
+const char *format_host(int af, int len, const void *addr, 
+                       char *buf, int buflen)
 {
 #ifdef RESOLVE_HOSTNAMES
        if (resolve_hosts) {

diff --git a/tc/tc.c b/tc/tc.c
index 35b3a95cfc87dc4e830620630eeaca856d74d885..d91aaaecf1a8350eaaf1904ba3d8529db91cebee 100644 (file)
--- a/tc/tc.c
+++ b/tc/tc.c
@@ -96,7 +96,7 @@ static int f_parse_noopt(struct filter_util *qu, char *fhandle, int argc, char *
 }
 #endif
 
-struct qdisc_util *get_qdisc_kind(char *str)
+struct qdisc_util *get_qdisc_kind(const char *str)
 {
        void *dlh;
        char buf[256];
@@ -140,7 +140,7 @@ noexist:
 }
 
 
-struct filter_util *get_filter_kind(char *str)
+struct filter_util *get_filter_kind(const char *str)
 {
        void *dlh;
        char buf[256];

diff --git a/tc/tc_util.h b/tc/tc_util.h
index bdc88d1f8dfbeb4599dc00fd6a45ae4eeee944f3..b3300f0ff7347a1a6e207f6efb89a6f1b09f8a88 100644 (file)
--- a/tc/tc_util.h
+++ b/tc/tc_util.h
@@ -26,14 +26,14 @@ struct filter_util
 };
 
 
-extern struct qdisc_util *get_qdisc_kind(char *str);
-extern struct filter_util *get_filter_kind(char *str);
+extern struct qdisc_util *get_qdisc_kind(const char *str);
+extern struct filter_util *get_filter_kind(const char *str);
 
-extern int get_qdisc_handle(__u32 *h, char *str);
-extern int get_rate(unsigned *rate, char *str);
-extern int get_size(unsigned *size, char *str);
+extern int get_qdisc_handle(__u32 *h, const char *str);
+extern int get_rate(unsigned *rate, const char *str);
+extern int get_size(unsigned *size, const char *str);
 extern int get_size_and_cell(unsigned *size, int *cell_log, char *str);
-extern int get_usecs(unsigned *usecs, char *str);
+extern int get_usecs(unsigned *usecs, const char *str);
 extern int print_rate(char *buf, int len, __u32 rate);
 extern int print_size(char *buf, int len, __u32 size);
 extern int print_qdisc_handle(char *buf, int len, __u32 h);
@@ -46,7 +46,7 @@ extern char * sprint_usecs(__u32 usecs, char *buf);
 
 extern void print_tcstats(FILE *fp, struct tc_stats *st);
 
-extern int get_tc_classid(__u32 *h, char *str);
+extern int get_tc_classid(__u32 *h, const char *str);
 extern int print_tc_classid(char *buf, int len, __u32 h);
 extern char * sprint_tc_classid(__u32 h, char *buf);