diff options
| author | Florian Forster <octo@verplant.org> | 2006-06-18 17:18:03 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-18 21:19:09 -0700 |
| commit | cfd432e63d77478d913497a62827ed95c56dda73 (patch) | |
| tree | b211821af83ec2653f23c6ea3d71fd8bd0e69397 | |
| parent | 64e86c57867593ba0ee77a7b0ff0eb8e9d4d8ed5 (diff) | |
| download | git-cfd432e63d77478d913497a62827ed95c56dda73.tar.gz git-cfd432e63d77478d913497a62827ed95c56dda73.tar.xz | |
Remove ranges from switch statements.
Though very nice and readable, the "case 'a'...'z':" construct is not ANSI C99
compliant. This patch unfolds the range in `quote.c' and substitutes the
switch-statement with an if-statement in `http-fetch.c' and `http-push.c'.
Signed-off-by: Florian Forster <octo@verplant.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | http-fetch.c | 13 | ||||
| -rw-r--r-- | http-push.c | 13 | ||||
| -rw-r--r-- | quote.c | 9 |
3 files changed, 22 insertions, 13 deletions
diff --git a/http-fetch.c b/http-fetch.c index da1a7f541..3a2cb5e1f 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -1136,13 +1136,14 @@ int fetch(unsigned char *sha1) static inline int needs_quote(int ch) { - switch (ch) { - case '/': case '-': case '.': - case 'A'...'Z': case 'a'...'z': case '0'...'9': + if (((ch >= 'A') && (ch <= 'Z')) + || ((ch >= 'a') && (ch <= 'z')) + || ((ch >= '0') && (ch <= '9')) + || (ch == '/') + || (ch == '-') + || (ch == '.')) return 0; - default: - return 1; - } + return 1; } static inline int hex(int v) diff --git a/http-push.c b/http-push.c index ba64f8fff..aaf155c5b 100644 --- a/http-push.c +++ b/http-push.c @@ -1077,13 +1077,14 @@ static int fetch_indices(void) static inline int needs_quote(int ch) { - switch (ch) { - case '/': case '-': case '.': - case 'A'...'Z': case 'a'...'z': case '0'...'9': + if (((ch >= 'A') && (ch <= 'Z')) + || ((ch >= 'a') && (ch <= 'z')) + || ((ch >= '0') && (ch <= '9')) + || (ch == '/') + || (ch == '-') + || (ch == '.')) return 0; - default: - return 1; - } + return 1; } static inline int hex(int v) @@ -206,7 +206,14 @@ char *unquote_c_style(const char *quoted, const char **endp) case '\\': case '"': break; /* verbatim */ - case '0'...'7': + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': /* octal */ ac = ((ch - '0') << 6); if ((ch = *sp++) < '0' || '7' < ch) |