diff options
author | jilles <jilles@FreeBSD.org> | 2009-12-24 18:41:14 +0000 |
---|---|---|
committer | jilles <jilles@FreeBSD.org> | 2009-12-24 18:41:14 +0000 |
commit | 8e458de8523a07bb3be5f06ed227236cb12be7f4 (patch) | |
tree | 3810323287749c3a09fadeeed64429a5bf2fbb4d /bin/sh/expand.c | |
parent | ff49e8168bd001a89cc6ca577b7b33399eb2c409 (diff) | |
download | FreeBSD-src-8e458de8523a07bb3be5f06ed227236cb12be7f4.zip FreeBSD-src-8e458de8523a07bb3be5f06ed227236cb12be7f4.tar.gz |
sh: Constify various strings.
Most of this is adding const keywords, but setvar() in var.c had to be
changed somewhat more.
Diffstat (limited to 'bin/sh/expand.c')
-rw-r--r-- | bin/sh/expand.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/sh/expand.c b/bin/sh/expand.c index af79e8c..db86dac 100644 --- a/bin/sh/expand.c +++ b/bin/sh/expand.c @@ -107,7 +107,7 @@ STATIC void expmeta(char *, char *); STATIC void addfname(char *); STATIC struct strlist *expsort(struct strlist *); STATIC struct strlist *msort(struct strlist *, int); -STATIC int pmatch(char *, char *, int); +STATIC int pmatch(const char *, const char *, int); STATIC char *cvtnum(int, char *); STATIC int collate_range_cmp(int, int); @@ -1338,7 +1338,7 @@ msort(struct strlist *list, int len) */ int -patmatch(char *pattern, char *string, int squoted) +patmatch(const char *pattern, const char *string, int squoted) { #ifdef notdef if (pattern[0] == '!' && pattern[1] == '!') @@ -1350,9 +1350,9 @@ patmatch(char *pattern, char *string, int squoted) STATIC int -pmatch(char *pattern, char *string, int squoted) +pmatch(const char *pattern, const char *string, int squoted) { - char *p, *q; + const char *p, *q; char c; p = pattern; @@ -1400,7 +1400,7 @@ pmatch(char *pattern, char *string, int squoted) } while (*q++ != '\0'); return 0; case '[': { - char *endp; + const char *endp; int invert, found; char chr; @@ -1504,7 +1504,7 @@ rmescapes(char *str) */ int -casematch(union node *pattern, char *val) +casematch(union node *pattern, const char *val) { struct stackmark smark; int result; |