diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2005-08-30 11:55:05 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:35:01 -0500 |
commit | b674411eb46c9e45f2740a1f9bac365e9a347e9c (patch) | |
tree | 02cac6467a11c9c3600295d61f57d6259cc6580b /source4/torture | |
parent | b75ca9aa2cf9a932547228458e0b3ad8e1053826 (diff) | |
download | samba-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/torture')
-rw-r--r-- | source4/torture/nbt/register.c | 2 | ||||
-rw-r--r-- | source4/torture/nbt/wins.c | 2 | ||||
-rw-r--r-- | source4/torture/raw/search.c | 4 | ||||
-rw-r--r-- | source4/torture/rpc/samsync.c | 8 | ||||
-rw-r--r-- | source4/torture/t_strcmp.c | 4 | ||||
-rw-r--r-- | source4/torture/torture_util.c | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/source4/torture/nbt/register.c b/source4/torture/nbt/register.c index b35808c844..4b5931d341 100644 --- a/source4/torture/nbt/register.c +++ b/source4/torture/nbt/register.c @@ -33,7 +33,7 @@ }} while (0) #define CHECK_STRING(v, correct) do { \ - if (StrCaseCmp(v, correct) != 0) { \ + if (strcasecmp_m(v, correct) != 0) { \ printf("(%s) Incorrect value %s='%s' - should be '%s'\n", \ __location__, #v, v, correct); \ ret = False; \ diff --git a/source4/torture/nbt/wins.c b/source4/torture/nbt/wins.c index 852147786e..b762c83609 100644 --- a/source4/torture/nbt/wins.c +++ b/source4/torture/nbt/wins.c @@ -34,7 +34,7 @@ #define CHECK_STRING(v, correct) do { \ if ((v) != (correct) && \ - ((v)==NULL || (correct)==NULL || StrCaseCmp(v, correct) != 0)) { \ + ((v)==NULL || (correct)==NULL || strcasecmp_m(v, correct) != 0)) { \ printf("(%s) Incorrect value %s='%s' - should be '%s'\n", \ __location__, #v, v, correct); \ ret = False; \ diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c index d1ea290c62..96ceaf0a02 100644 --- a/source4/torture/raw/search.c +++ b/source4/torture/raw/search.c @@ -554,7 +554,7 @@ static NTSTATUS multiple_search(struct smbcli_state *cli, }} while (0) #define CHECK_STRING(v, correct) do { \ - if (StrCaseCmp(v, correct) != 0) { \ + if (strcasecmp_m(v, correct) != 0) { \ printf("(%s) Incorrect value %s='%s' - should be '%s'\n", \ __location__, #v, v, correct); \ ret = False; \ @@ -900,7 +900,7 @@ static BOOL test_sorted(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) const char *name1, *name2; name1 = result.list[i].both_directory_info.name.s; name2 = result.list[i+1].both_directory_info.name.s; - if (StrCaseCmp(name1, name2) > 0) { + if (strcasecmp_m(name1, name2) > 0) { printf("non-alphabetical order at entry %d '%s' '%s'\n", i, name1, name2); printf("Server does not produce sorted directory listings (not an error)\n"); diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c index b15ee98200..9cd30ef019 100644 --- a/source4/torture/rpc/samsync.c +++ b/source4/torture/rpc/samsync.c @@ -286,7 +286,7 @@ static BOOL samsync_handle_domain(TALLOC_CTX *mem_ctx, struct samsync_state *sam case SAM_DATABASE_DOMAIN: break; case SAM_DATABASE_BUILTIN: - if (StrCaseCmp("BUILTIN", domain->domain_name.string) != 0) { + if (strcasecmp_m("BUILTIN", domain->domain_name.string) != 0) { printf("BUILTIN domain has different name: %s\n", domain->domain_name.string); } break; @@ -300,7 +300,7 @@ static BOOL samsync_handle_domain(TALLOC_CTX *mem_ctx, struct samsync_state *sam samsync_state->domain_name[database_id] = talloc_reference(samsync_state, domain->domain_name.string); } else { - if (StrCaseCmp(samsync_state->domain_name[database_id], domain->domain_name.string) != 0) { + if (strcasecmp_m(samsync_state->domain_name[database_id], domain->domain_name.string) != 0) { printf("Domain has name varies!: %s != %s\n", samsync_state->domain_name[database_id], domain->domain_name.string); return False; @@ -371,7 +371,7 @@ static BOOL samsync_handle_policy(TALLOC_CTX *mem_ctx, struct samsync_state *sam samsync_state->domain_name[SAM_DATABASE_DOMAIN] = talloc_reference(samsync_state, policy->primary_domain_name.string); } else { - if (StrCaseCmp(samsync_state->domain_name[SAM_DATABASE_DOMAIN], policy->primary_domain_name.string) != 0) { + if (strcasecmp_m(samsync_state->domain_name[SAM_DATABASE_DOMAIN], policy->primary_domain_name.string) != 0) { printf("PRIMARY domain has name varies between DOMAIN and POLICY!: %s != %s\n", samsync_state->domain_name[SAM_DATABASE_DOMAIN], policy->primary_domain_name.string); return False; @@ -1194,7 +1194,7 @@ static BOOL test_DatabaseSync(struct samsync_state *samsync_state, for (t=samsync_state->trusted_domains; t; t=t->next) { char *secret_name = talloc_asprintf(trustdom_ctx, "G$$%s", t->name); for (s=samsync_state->secrets; s; s=s->next) { - if (StrCaseCmp(s->name, secret_name) == 0) { + if (strcasecmp_m(s->name, secret_name) == 0) { NTSTATUS nt_status; struct samr_Password nt_hash; mdfour(nt_hash.hash, s->secret.data, s->secret.length); diff --git a/source4/torture/t_strcmp.c b/source4/torture/t_strcmp.c index 622769001b..15d000c98f 100644 --- a/source4/torture/t_strcmp.c +++ b/source4/torture/t_strcmp.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2003 by Martin Pool * - * Test harness for StrCaseCmp + * Test harness for strcasecmp_m */ #include "includes.h" @@ -14,7 +14,7 @@ int main(int argc, char *argv[]) return 2; } - printf("%d\n", StrCaseCmp(argv[1], argv[2])); + printf("%d\n", strcasecmp_m(argv[1], argv[2])); return 0; } diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c index 42e2608c41..59eef81569 100644 --- a/source4/torture/torture_util.c +++ b/source4/torture/torture_util.c @@ -366,7 +366,7 @@ NTSTATUS torture_check_ea(struct smbcli_state *cli, return NT_STATUS_EA_CORRUPT_ERROR; } - if (StrCaseCmp(eaname, info.ea_list.out.eas[0].name.s) != 0) { + if (strcasecmp_m(eaname, info.ea_list.out.eas[0].name.s) != 0) { printf("Expected ea '%s' not '%s' in ea_list\n", eaname, info.ea_list.out.eas[0].name.s); talloc_free(mem_ctx); |