The Great Renaming, Part 2: prefix strcasecmp and strncasecmp with yasm__.
svn path=/trunk/yasm/; revision=841
diff --git a/frontends/yasm/yasm-module.c b/frontends/yasm/yasm-module.c
index f4ad1c5..ac215fb 100644
--- a/frontends/yasm/yasm-module.c
+++ b/frontends/yasm/yasm-module.c
@@ -74,7 +74,7 @@
/* See if the module has already been loaded. */
SLIST_FOREACH(m, &modules, link) {
- if (strcasecmp(m->keyword, keyword) == 0)
+ if (yasm__strcasecmp(m->keyword, keyword) == 0)
return m;
}
diff --git a/frontends/yasm/yasm.c b/frontends/yasm/yasm.c
index a5a2299..a1eeaf9 100644
--- a/frontends/yasm/yasm.c
+++ b/frontends/yasm/yasm.c
@@ -325,8 +325,8 @@
* for the active object format.
*/
for (i=0; cur_objfmt->dbgfmt_keywords[i]; i++)
- if (strcasecmp(cur_objfmt->dbgfmt_keywords[i],
- cur_dbgfmt->keyword) == 0)
+ if (yasm__strcasecmp(cur_objfmt->dbgfmt_keywords[i],
+ cur_dbgfmt->keyword) == 0)
matched_dbgfmt = 1;
if (!matched_dbgfmt) {
print_error(
@@ -378,7 +378,7 @@
* for the active parser.
*/
for (i=0; cur_parser->preproc_keywords[i]; i++)
- if (strcasecmp(cur_parser->preproc_keywords[i],
+ if (yasm__strcasecmp(cur_parser->preproc_keywords[i],
cur_preproc->keyword) == 0)
matched_preproc = 1;
if (!matched_preproc) {
diff --git a/libyasm/strcasecmp.c b/libyasm/strcasecmp.c
index 1a948d5..a7b2a92 100644
--- a/libyasm/strcasecmp.c
+++ b/libyasm/strcasecmp.c
@@ -42,7 +42,7 @@
#include <ctype.h>
int
-strcasecmp(const char *s1, const char *s2)
+yasm__strcasecmp(const char *s1, const char *s2)
{
const unsigned char
*us1 = (const unsigned char *)s1,
@@ -55,7 +55,7 @@
}
int
-strncasecmp(const char *s1, const char *s2, size_t n)
+yasm__strncasecmp(const char *s1, const char *s2, size_t n)
{
const unsigned char
*us1 = (const unsigned char *)s1,
diff --git a/libyasm/util.h b/libyasm/util.h
index 53d875d..4236844 100644
--- a/libyasm/util.h
+++ b/libyasm/util.h
@@ -82,21 +82,24 @@
/*@null@*/ char *strsep(char **stringp, const char *delim);
#endif
-#ifndef HAVE_STRCASECMP
+#ifdef HAVE_STRCASECMP
+# define yasm__strcasecmp(x, y) strcasecmp(x, y)
+# define yasm__strncasecmp(x, y) strncasecmp(x, y)
+#else
# ifdef HAVE_STRICMP
-# define strcasecmp(x, y) stricmp(x, y)
-# define strncasecmp(x, y) strnicmp(x, y)
+# define yasm__strcasecmp(x, y) stricmp(x, y)
+# define yasm__strncasecmp(x, y) strnicmp(x, y)
# elif HAVE_STRCMPI
-# define strcasecmp(x, y) strcmpi(x, y)
-# define strncasecmp(x, y) strncmpi(x, y)
+# define yasm__strcasecmp(x, y) strcmpi(x, y)
+# define yasm__strncasecmp(x, y) strncmpi(x, y)
# else
# define USE_OUR_OWN_STRCASECMP
# endif
#endif
#if defined(USE_OUR_OWN_STRCASECMP) || defined(lint)
-int strcasecmp(const char *s1, const char *s2);
-int strncasecmp(const char *s1, const char *s2, size_t n);
+int yasm__strcasecmp(const char *s1, const char *s2);
+int yasm__strncasecmp(const char *s1, const char *s2, size_t n);
#endif
#if !defined(HAVE_TOASCII) || defined(lint)
diff --git a/modules/arch/x86/x86arch.c b/modules/arch/x86/x86arch.c
index 406f15f..a4348b0 100644
--- a/modules/arch/x86/x86arch.c
+++ b/modules/arch/x86/x86arch.c
@@ -65,7 +65,7 @@
const yasm_intnum *intn;
long lval;
- if (strcasecmp(name, "bits") == 0) {
+ if (yasm__strcasecmp(name, "bits") == 0) {
if ((vp = yasm_vps_first(valparams)) && !vp->val &&
vp->param != NULL &&
(intn = yasm_expr_get_intnum(&vp->param, NULL)) != NULL &&
diff --git a/modules/objfmts/bin/bin-objfmt.c b/modules/objfmts/bin/bin-objfmt.c
index 0a60647..79fff60 100644
--- a/modules/objfmts/bin/bin-objfmt.c
+++ b/modules/objfmts/bin/bin-objfmt.c
@@ -361,7 +361,7 @@
/* Check for ALIGN qualifier */
while ((vp = yasm_vps_next(vp))) {
- if (strcasecmp(vp->val, "align") == 0 && vp->param) {
+ if (yasm__strcasecmp(vp->val, "align") == 0 && vp->param) {
/*@dependent@*/ /*@null@*/ const yasm_intnum *align;
unsigned long bitcnt;
@@ -444,7 +444,7 @@
yasm_section *sect;
yasm_valparam *vp;
- if (strcasecmp(name, "org") == 0) {
+ if (yasm__strcasecmp(name, "org") == 0) {
/*@dependent@*/ /*@null@*/ const yasm_intnum *start = NULL;
/* ORG takes just a simple integer as param */
diff --git a/modules/objfmts/coff/coff-objfmt.c b/modules/objfmts/coff/coff-objfmt.c
index a37343a..29dd142 100644
--- a/modules/objfmts/coff/coff-objfmt.c
+++ b/modules/objfmts/coff/coff-objfmt.c
@@ -744,14 +744,14 @@
flags = COFF_STYP_TEXT;
while ((vp = yasm_vps_next(vp))) {
- if (strcasecmp(vp->val, "code") == 0 ||
- strcasecmp(vp->val, "text") == 0) {
+ if (yasm__strcasecmp(vp->val, "code") == 0 ||
+ yasm__strcasecmp(vp->val, "text") == 0) {
flags = COFF_STYP_TEXT;
flags_override = 1;
- } else if (strcasecmp(vp->val, "data") == 0) {
+ } else if (yasm__strcasecmp(vp->val, "data") == 0) {
flags = COFF_STYP_DATA;
flags_override = 1;
- } else if (strcasecmp(vp->val, "bss") == 0) {
+ } else if (yasm__strcasecmp(vp->val, "bss") == 0) {
flags = COFF_STYP_BSS;
flags_override = 1;
resonly = 1;
diff --git a/modules/parsers/nasm/nasm-bison.y b/modules/parsers/nasm/nasm-bison.y
index 6fd986f..b7334fc 100644
--- a/modules/parsers/nasm/nasm-bison.y
+++ b/modules/parsers/nasm/nasm-bison.y
@@ -550,7 +550,7 @@
unsigned long lindex = cur_lindex;
/* Handle (mostly) output-format independent directives here */
- if (strcasecmp(name, "extern") == 0) {
+ if (yasm__strcasecmp(name, "extern") == 0) {
vp = yasm_vps_first(valparams);
if (vp->val) {
sym = yasm_symrec_declare(vp->val, YASM_SYM_EXTERN, lindex);
@@ -559,7 +559,7 @@
lindex);
} else
cur_we->error(lindex, N_("invalid argument to [%s]"), "EXTERN");
- } else if (strcasecmp(name, "global") == 0) {
+ } else if (yasm__strcasecmp(name, "global") == 0) {
vp = yasm_vps_first(valparams);
if (vp->val) {
sym = yasm_symrec_declare(vp->val, YASM_SYM_GLOBAL, lindex);
@@ -568,7 +568,7 @@
lindex);
} else
cur_we->error(lindex, N_("invalid argument to [%s]"), "GLOBAL");
- } else if (strcasecmp(name, "common") == 0) {
+ } else if (yasm__strcasecmp(name, "common") == 0) {
vp = yasm_vps_first(valparams);
if (vp->val) {
vp2 = yasm_vps_next(vp);
@@ -597,8 +597,8 @@
}
} else
cur_we->error(lindex, N_("invalid argument to [%s]"), "COMMON");
- } else if (strcasecmp(name, "section") == 0 ||
- strcasecmp(name, "segment") == 0) {
+ } else if (yasm__strcasecmp(name, "section") == 0 ||
+ yasm__strcasecmp(name, "segment") == 0) {
yasm_section *new_section =
nasm_parser_objfmt->sections_switch(&nasm_parser_sections,
valparams, objext_valparams,
@@ -609,7 +609,7 @@
yasm_bcs_last(yasm_section_get_bytecodes(new_section));
} else
cur_we->error(lindex, N_("invalid argument to [%s]"), "SECTION");
- } else if (strcasecmp(name, "absolute") == 0) {
+ } else if (yasm__strcasecmp(name, "absolute") == 0) {
/* it can be just an ID or a complete expression, so handle both. */
vp = yasm_vps_first(valparams);
if (vp->val)
@@ -625,7 +625,7 @@
vp->param = NULL;
}
nasm_parser_prev_bc = (yasm_bytecode *)NULL;
- } else if (strcasecmp(name, "cpu") == 0) {
+ } else if (yasm__strcasecmp(name, "cpu") == 0) {
yasm_vps_foreach(vp, valparams) {
if (vp->val)
nasm_parser_arch->parse.switch_cpu(vp->val, lindex);
diff --git a/modules/preprocs/nasm/nasmlib.h b/modules/preprocs/nasm/nasmlib.h
index 9d7f393..7fe20cc 100644
--- a/modules/preprocs/nasm/nasmlib.h
+++ b/modules/preprocs/nasm/nasmlib.h
@@ -21,8 +21,8 @@
#define nasm_free(p) if (p) xfree(p)
#define nasm_strdup xstrdup
#define nasm_strndup xstrndup
-#define nasm_stricmp strcasecmp
-#define nasm_strnicmp strncasecmp
+#define nasm_stricmp yasm__strcasecmp
+#define nasm_strnicmp yasm__strncasecmp
/*
* Convert a string into a number, using NASM number rules. Sets
diff --git a/src/arch/x86/x86arch.c b/src/arch/x86/x86arch.c
index 406f15f..a4348b0 100644
--- a/src/arch/x86/x86arch.c
+++ b/src/arch/x86/x86arch.c
@@ -65,7 +65,7 @@
const yasm_intnum *intn;
long lval;
- if (strcasecmp(name, "bits") == 0) {
+ if (yasm__strcasecmp(name, "bits") == 0) {
if ((vp = yasm_vps_first(valparams)) && !vp->val &&
vp->param != NULL &&
(intn = yasm_expr_get_intnum(&vp->param, NULL)) != NULL &&
diff --git a/src/main.c b/src/main.c
index a5a2299..a1eeaf9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -325,8 +325,8 @@
* for the active object format.
*/
for (i=0; cur_objfmt->dbgfmt_keywords[i]; i++)
- if (strcasecmp(cur_objfmt->dbgfmt_keywords[i],
- cur_dbgfmt->keyword) == 0)
+ if (yasm__strcasecmp(cur_objfmt->dbgfmt_keywords[i],
+ cur_dbgfmt->keyword) == 0)
matched_dbgfmt = 1;
if (!matched_dbgfmt) {
print_error(
@@ -378,7 +378,7 @@
* for the active parser.
*/
for (i=0; cur_parser->preproc_keywords[i]; i++)
- if (strcasecmp(cur_parser->preproc_keywords[i],
+ if (yasm__strcasecmp(cur_parser->preproc_keywords[i],
cur_preproc->keyword) == 0)
matched_preproc = 1;
if (!matched_preproc) {
diff --git a/src/module.c b/src/module.c
index f4ad1c5..ac215fb 100644
--- a/src/module.c
+++ b/src/module.c
@@ -74,7 +74,7 @@
/* See if the module has already been loaded. */
SLIST_FOREACH(m, &modules, link) {
- if (strcasecmp(m->keyword, keyword) == 0)
+ if (yasm__strcasecmp(m->keyword, keyword) == 0)
return m;
}
diff --git a/src/objfmts/bin/bin-objfmt.c b/src/objfmts/bin/bin-objfmt.c
index 0a60647..79fff60 100644
--- a/src/objfmts/bin/bin-objfmt.c
+++ b/src/objfmts/bin/bin-objfmt.c
@@ -361,7 +361,7 @@
/* Check for ALIGN qualifier */
while ((vp = yasm_vps_next(vp))) {
- if (strcasecmp(vp->val, "align") == 0 && vp->param) {
+ if (yasm__strcasecmp(vp->val, "align") == 0 && vp->param) {
/*@dependent@*/ /*@null@*/ const yasm_intnum *align;
unsigned long bitcnt;
@@ -444,7 +444,7 @@
yasm_section *sect;
yasm_valparam *vp;
- if (strcasecmp(name, "org") == 0) {
+ if (yasm__strcasecmp(name, "org") == 0) {
/*@dependent@*/ /*@null@*/ const yasm_intnum *start = NULL;
/* ORG takes just a simple integer as param */
diff --git a/src/objfmts/coff/coff-objfmt.c b/src/objfmts/coff/coff-objfmt.c
index a37343a..29dd142 100644
--- a/src/objfmts/coff/coff-objfmt.c
+++ b/src/objfmts/coff/coff-objfmt.c
@@ -744,14 +744,14 @@
flags = COFF_STYP_TEXT;
while ((vp = yasm_vps_next(vp))) {
- if (strcasecmp(vp->val, "code") == 0 ||
- strcasecmp(vp->val, "text") == 0) {
+ if (yasm__strcasecmp(vp->val, "code") == 0 ||
+ yasm__strcasecmp(vp->val, "text") == 0) {
flags = COFF_STYP_TEXT;
flags_override = 1;
- } else if (strcasecmp(vp->val, "data") == 0) {
+ } else if (yasm__strcasecmp(vp->val, "data") == 0) {
flags = COFF_STYP_DATA;
flags_override = 1;
- } else if (strcasecmp(vp->val, "bss") == 0) {
+ } else if (yasm__strcasecmp(vp->val, "bss") == 0) {
flags = COFF_STYP_BSS;
flags_override = 1;
resonly = 1;
diff --git a/src/parsers/nasm/nasm-bison.y b/src/parsers/nasm/nasm-bison.y
index 6fd986f..b7334fc 100644
--- a/src/parsers/nasm/nasm-bison.y
+++ b/src/parsers/nasm/nasm-bison.y
@@ -550,7 +550,7 @@
unsigned long lindex = cur_lindex;
/* Handle (mostly) output-format independent directives here */
- if (strcasecmp(name, "extern") == 0) {
+ if (yasm__strcasecmp(name, "extern") == 0) {
vp = yasm_vps_first(valparams);
if (vp->val) {
sym = yasm_symrec_declare(vp->val, YASM_SYM_EXTERN, lindex);
@@ -559,7 +559,7 @@
lindex);
} else
cur_we->error(lindex, N_("invalid argument to [%s]"), "EXTERN");
- } else if (strcasecmp(name, "global") == 0) {
+ } else if (yasm__strcasecmp(name, "global") == 0) {
vp = yasm_vps_first(valparams);
if (vp->val) {
sym = yasm_symrec_declare(vp->val, YASM_SYM_GLOBAL, lindex);
@@ -568,7 +568,7 @@
lindex);
} else
cur_we->error(lindex, N_("invalid argument to [%s]"), "GLOBAL");
- } else if (strcasecmp(name, "common") == 0) {
+ } else if (yasm__strcasecmp(name, "common") == 0) {
vp = yasm_vps_first(valparams);
if (vp->val) {
vp2 = yasm_vps_next(vp);
@@ -597,8 +597,8 @@
}
} else
cur_we->error(lindex, N_("invalid argument to [%s]"), "COMMON");
- } else if (strcasecmp(name, "section") == 0 ||
- strcasecmp(name, "segment") == 0) {
+ } else if (yasm__strcasecmp(name, "section") == 0 ||
+ yasm__strcasecmp(name, "segment") == 0) {
yasm_section *new_section =
nasm_parser_objfmt->sections_switch(&nasm_parser_sections,
valparams, objext_valparams,
@@ -609,7 +609,7 @@
yasm_bcs_last(yasm_section_get_bytecodes(new_section));
} else
cur_we->error(lindex, N_("invalid argument to [%s]"), "SECTION");
- } else if (strcasecmp(name, "absolute") == 0) {
+ } else if (yasm__strcasecmp(name, "absolute") == 0) {
/* it can be just an ID or a complete expression, so handle both. */
vp = yasm_vps_first(valparams);
if (vp->val)
@@ -625,7 +625,7 @@
vp->param = NULL;
}
nasm_parser_prev_bc = (yasm_bytecode *)NULL;
- } else if (strcasecmp(name, "cpu") == 0) {
+ } else if (yasm__strcasecmp(name, "cpu") == 0) {
yasm_vps_foreach(vp, valparams) {
if (vp->val)
nasm_parser_arch->parse.switch_cpu(vp->val, lindex);
diff --git a/src/preprocs/nasm/nasmlib.h b/src/preprocs/nasm/nasmlib.h
index 9d7f393..7fe20cc 100644
--- a/src/preprocs/nasm/nasmlib.h
+++ b/src/preprocs/nasm/nasmlib.h
@@ -21,8 +21,8 @@
#define nasm_free(p) if (p) xfree(p)
#define nasm_strdup xstrdup
#define nasm_strndup xstrndup
-#define nasm_stricmp strcasecmp
-#define nasm_strnicmp strncasecmp
+#define nasm_stricmp yasm__strcasecmp
+#define nasm_strnicmp yasm__strncasecmp
/*
* Convert a string into a number, using NASM number rules. Sets
diff --git a/src/strcasecmp.c b/src/strcasecmp.c
index 1a948d5..a7b2a92 100644
--- a/src/strcasecmp.c
+++ b/src/strcasecmp.c
@@ -42,7 +42,7 @@
#include <ctype.h>
int
-strcasecmp(const char *s1, const char *s2)
+yasm__strcasecmp(const char *s1, const char *s2)
{
const unsigned char
*us1 = (const unsigned char *)s1,
@@ -55,7 +55,7 @@
}
int
-strncasecmp(const char *s1, const char *s2, size_t n)
+yasm__strncasecmp(const char *s1, const char *s2, size_t n)
{
const unsigned char
*us1 = (const unsigned char *)s1,
diff --git a/src/util.h b/src/util.h
index 53d875d..4236844 100644
--- a/src/util.h
+++ b/src/util.h
@@ -82,21 +82,24 @@
/*@null@*/ char *strsep(char **stringp, const char *delim);
#endif
-#ifndef HAVE_STRCASECMP
+#ifdef HAVE_STRCASECMP
+# define yasm__strcasecmp(x, y) strcasecmp(x, y)
+# define yasm__strncasecmp(x, y) strncasecmp(x, y)
+#else
# ifdef HAVE_STRICMP
-# define strcasecmp(x, y) stricmp(x, y)
-# define strncasecmp(x, y) strnicmp(x, y)
+# define yasm__strcasecmp(x, y) stricmp(x, y)
+# define yasm__strncasecmp(x, y) strnicmp(x, y)
# elif HAVE_STRCMPI
-# define strcasecmp(x, y) strcmpi(x, y)
-# define strncasecmp(x, y) strncmpi(x, y)
+# define yasm__strcasecmp(x, y) strcmpi(x, y)
+# define yasm__strncasecmp(x, y) strncmpi(x, y)
# else
# define USE_OUR_OWN_STRCASECMP
# endif
#endif
#if defined(USE_OUR_OWN_STRCASECMP) || defined(lint)
-int strcasecmp(const char *s1, const char *s2);
-int strncasecmp(const char *s1, const char *s2, size_t n);
+int yasm__strcasecmp(const char *s1, const char *s2);
+int yasm__strncasecmp(const char *s1, const char *s2, size_t n);
#endif
#if !defined(HAVE_TOASCII) || defined(lint)
diff --git a/util.h b/util.h
index 53d875d..4236844 100644
--- a/util.h
+++ b/util.h
@@ -82,21 +82,24 @@
/*@null@*/ char *strsep(char **stringp, const char *delim);
#endif
-#ifndef HAVE_STRCASECMP
+#ifdef HAVE_STRCASECMP
+# define yasm__strcasecmp(x, y) strcasecmp(x, y)
+# define yasm__strncasecmp(x, y) strncasecmp(x, y)
+#else
# ifdef HAVE_STRICMP
-# define strcasecmp(x, y) stricmp(x, y)
-# define strncasecmp(x, y) strnicmp(x, y)
+# define yasm__strcasecmp(x, y) stricmp(x, y)
+# define yasm__strncasecmp(x, y) strnicmp(x, y)
# elif HAVE_STRCMPI
-# define strcasecmp(x, y) strcmpi(x, y)
-# define strncasecmp(x, y) strncmpi(x, y)
+# define yasm__strcasecmp(x, y) strcmpi(x, y)
+# define yasm__strncasecmp(x, y) strncmpi(x, y)
# else
# define USE_OUR_OWN_STRCASECMP
# endif
#endif
#if defined(USE_OUR_OWN_STRCASECMP) || defined(lint)
-int strcasecmp(const char *s1, const char *s2);
-int strncasecmp(const char *s1, const char *s2, size_t n);
+int yasm__strcasecmp(const char *s1, const char *s2);
+int yasm__strncasecmp(const char *s1, const char *s2, size_t n);
#endif
#if !defined(HAVE_TOASCII) || defined(lint)
