From: Florian Forster <octo@verplant.org>
To: git@vger.kernel.org
Cc: Florian Forster <octo@verplant.org>
Subject: [PATCH 1/7] Remove ranges from switch statements.
Date: Sun, 18 Jun 2006 17:18:03 +0200 [thread overview]
Message-ID: <1150643889264-git-send-email-octo@verplant.org> (raw)
In-Reply-To: <11506438892865-git-send-email-octo@verplant.org>
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>
---
http-fetch.c | 13 +++++++------
http-push.c | 13 +++++++------
quote.c | 9 ++++++++-
3 files changed, 22 insertions(+), 13 deletions(-)
d90149c5b4e91938329120bdde609e5f6d9b03e8
diff --git a/http-fetch.c b/http-fetch.c
index da1a7f5..3a2cb5e 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 2d9441e..364ab76 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)
diff --git a/quote.c b/quote.c
index 06792d4..dcc2326 100644
--- a/quote.c
+++ b/quote.c
@@ -206,7 +206,14 @@ #define EMIT(c) (outp ? (*outp++ = (c))
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)
--
1.3.3
next prev parent reply other threads:[~2006-06-18 15:18 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-18 5:50 [PATCH] Fix git to be (more) ANSI C99 compliant Florian Forster
2006-06-18 8:07 ` Timo Hirvonen
2006-06-18 8:14 ` Thomas Glanzmann
2006-06-18 8:21 ` Florian Forster
2006-06-18 8:43 ` Timo Hirvonen
2006-06-18 8:26 ` Rene Scharfe
2006-06-18 8:35 ` Florian Forster
2006-06-18 15:18 ` [PATCH 0/7] Improve ANSI C99 compliance Florian Forster
2006-06-18 15:18 ` Florian Forster [this message]
2006-06-18 15:18 ` [PATCH 2/7] Initialize FAMs using `FLEX_ARRAY' Florian Forster
2006-06-18 15:18 ` [PATCH 3/7] Don't instantiate structures with FAMs Florian Forster
2006-06-18 15:18 ` [PATCH 4/7] Cast pointers to `void *' when used in a format Florian Forster
2006-06-18 15:18 ` [PATCH 5/7] Don't use empty structure initializers Florian Forster
2006-06-18 15:18 ` [PATCH 6/7] Change types used in bitfields to be `int's Florian Forster
2006-06-18 15:18 ` [PATCH 7/7] Remove all void-pointer arithmetic Florian Forster
2006-06-18 21:07 ` [PATCH 1/7] Remove ranges from switch statements Junio C Hamano
2006-06-18 21:24 ` Timo Hirvonen
2006-06-18 8:29 ` [PATCH] Fix git to be (more) ANSI C99 compliant Junio C Hamano
2006-06-18 16:50 ` Linus Torvalds
2006-06-19 21:21 ` Florian Forster
2006-06-20 1:59 ` Junio C Hamano
2006-06-20 8:16 ` Rene Scharfe
2006-06-20 8:58 ` Junio C Hamano
2006-06-21 11:15 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2006-06-19 9:17 [PATCH 1/7] Remove ranges from switch statements linux
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1150643889264-git-send-email-octo@verplant.org \
--to=octo@verplant.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).