summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-08-30 11:55:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:35:01 -0500
commitb674411eb46c9e45f2740a1f9bac365e9a347e9c (patch)
tree02cac6467a11c9c3600295d61f57d6259cc6580b /source4/lib
parentb75ca9aa2cf9a932547228458e0b3ad8e1053826 (diff)
downloadsamba-b674411eb46c9e45f2740a1f9bac365e9a347e9c.tar.gz
samba-b674411eb46c9e45f2740a1f9bac365e9a347e9c.tar.bz2
samba-b674411eb46c9e45f2740a1f9bac365e9a347e9c.zip
r9792: Rename StrCaseCmp -> strcasecmp_m. All these years I was thinking
StrCaseCmp was sys_strcasecmp, while it is in fact strcasecmp_m! (This used to be commit 200a8f6652cb2de7a8037a7a4c2a204b50aee2b1)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/appweb/mpr/miniMpr.h2
-rw-r--r--source4/lib/ms_fnmatch.c2
-rw-r--r--source4/lib/samba3/samba3.c6
-rw-r--r--source4/lib/samba3/secrets.c2
-rw-r--r--source4/lib/util_str.c6
5 files changed, 9 insertions, 9 deletions
diff --git a/source4/lib/appweb/mpr/miniMpr.h b/source4/lib/appweb/mpr/miniMpr.h
index 6fc4d50c31..0f668ab1d4 100644
--- a/source4/lib/appweb/mpr/miniMpr.h
+++ b/source4/lib/appweb/mpr/miniMpr.h
@@ -274,7 +274,7 @@ extern int mprMemcpy(char *dest, int destMax, const char *src, int nbytes);
extern void mprSetCtx(void *ctx);
extern void *mprMemCtx(void);
-#define mprStrCmpAnyCase(s1, s2) StrCaseCmp(s1, s2)
+#define mprStrCmpAnyCase(s1, s2) strcasecmp_m(s1, s2)
#ifdef __cplusplus
}
diff --git a/source4/lib/ms_fnmatch.c b/source4/lib/ms_fnmatch.c
index c405d2ff30..699341bede 100644
--- a/source4/lib/ms_fnmatch.c
+++ b/source4/lib/ms_fnmatch.c
@@ -163,7 +163,7 @@ int ms_fnmatch(const char *pattern, const char *string, enum protocol_types prot
if (strpbrk(pattern, "<>*?\"") == NULL) {
/* this is not just an optmisation - it is essential
for LANMAN1 correctness */
- return StrCaseCmp(pattern, string);
+ return strcasecmp_m(pattern, string);
}
if (protocol <= PROTOCOL_LANMAN2) {
diff --git a/source4/lib/samba3/samba3.c b/source4/lib/samba3/samba3.c
index 4b893c585a..56a7738693 100644
--- a/source4/lib/samba3/samba3.c
+++ b/source4/lib/samba3/samba3.c
@@ -31,7 +31,7 @@ struct samba3_domainsecrets *samba3_find_domainsecrets(struct samba3 *db, const
int i;
for (i = 0; i < db->secrets.domain_count; i++) {
- if (!StrCaseCmp(db->secrets.domains[i].name, name))
+ if (!strcasecmp_m(db->secrets.domains[i].name, name))
return &db->secrets.domains[i];
}
@@ -42,7 +42,7 @@ struct samba3_share_info *samba3_find_share(struct samba3 *db, const char *name)
{
int i;
for (i = 0; i < db->share_count; i++) {
- if (!StrCaseCmp(db->shares[i].name, name))
+ if (!strcasecmp_m(db->shares[i].name, name))
return &db->shares[i];
}
@@ -74,7 +74,7 @@ const char *samba3_get_param(struct samba3 *samba3, const char *section, const c
return NULL;
for (i = 0; i < share->parameter_count; i++) {
- if (!StrCaseCmp(share->parameters[i].name, param))
+ if (!strcasecmp_m(share->parameters[i].name, param))
return share->parameters[i].value;
}
diff --git a/source4/lib/samba3/secrets.c b/source4/lib/samba3/secrets.c
index 43f0a2ec12..0f3cc0c581 100644
--- a/source4/lib/samba3/secrets.c
+++ b/source4/lib/samba3/secrets.c
@@ -66,7 +66,7 @@ static struct samba3_domainsecrets *secrets_find_domain(TALLOC_CTX *ctx, struct
for (i = 0; i < db->domain_count; i++)
{
- if (!StrCaseCmp(db->domains[i].name, key))
+ if (!strcasecmp_m(db->domains[i].name, key))
return &db->domains[i];
}
diff --git a/source4/lib/util_str.c b/source4/lib/util_str.c
index a0e9da4160..685cc52c65 100644
--- a/source4/lib/util_str.c
+++ b/source4/lib/util_str.c
@@ -80,7 +80,7 @@ BOOL next_token(const char **ptr,char *buff, const char *sep, size_t bufsize)
/**
Case insensitive string compararison
**/
-int StrCaseCmp(const char *s1, const char *s2)
+int strcasecmp_m(const char *s1, const char *s2)
{
codepoint_t c1=0, c2=0;
size_t size1, size2;
@@ -122,7 +122,7 @@ BOOL strequal(const char *s1, const char *s2)
if (!s1 || !s2)
return(False);
- return StrCaseCmp(s1,s2) == 0;
+ return strcasecmp_m(s1,s2) == 0;
}
/**
@@ -477,7 +477,7 @@ BOOL in_list(const char *s, const char *list, BOOL casesensitive)
if (strcmp(tok,s) == 0)
return(True);
} else {
- if (StrCaseCmp(tok,s) == 0)
+ if (strcasecmp_m(tok,s) == 0)
return(True);
}
}