summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2012-05-02 00:18:56 +0400
committerCyrill Gorcunov <gorcunov@gmail.com>2012-05-02 00:19:38 +0400
commit194563915dc7754a91daba2e552212416d5c519f (patch)
tree187a9b06e9495675134ed2d1b92783df671e24cc
parent4d02ededde9d70c9eafc7dfd0c350110de2a6dcd (diff)
downloadnasm-194563915dc7754a91daba2e552212416d5c519f.tar.gz
preproc: Use bsii helper
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
-rw-r--r--preproc.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/preproc.c b/preproc.c
index 23eda8a8..78a71a3a 100644
--- a/preproc.c
+++ b/preproc.c
@@ -3570,7 +3570,6 @@ issue_error:
static int find_cc(Token * t)
{
Token *tt;
- int i, j, k, m;
if (!t)
return -1; /* Probably a %+ without a space */
@@ -3583,23 +3582,7 @@ static int find_cc(Token * t)
if (tt && (tt->type != TOK_OTHER || strcmp(tt->text, ",")))
return -1;
- i = -1;
- j = ARRAY_SIZE(conditions);
- while (j - i > 1) {
- k = (j + i) / 2;
- m = nasm_stricmp(t->text, conditions[k]);
- if (m == 0) {
- i = k;
- j = -2;
- break;
- } else if (m < 0) {
- j = k;
- } else
- i = k;
- }
- if (j != -2)
- return -1;
- return i;
+ return bsii(t->text, (const char **)conditions, ARRAY_SIZE(conditions));
}
static bool paste_tokens(Token **head, const struct tokseq_match *m,