diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-13 20:21:30 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-18 16:12:08 +0200 |
| commit | c615ebed6e3d273a682806b952d543e834e5630d (patch) | |
| tree | 4dbc96ec8a7ac5bcb158d331c07ceb0150bf4fe0 /source3/smbd | |
| parent | 7a11e5de395c928e4a37c58a7a7ac21a314449fe (diff) | |
| download | samba-c615ebed6e3d273a682806b952d543e834e5630d.tar.gz samba-c615ebed6e3d273a682806b952d543e834e5630d.tar.bz2 samba-c615ebed6e3d273a682806b952d543e834e5630d.zip | |
s3-lib Replace StrCaseCmp() with strcasecmp_m()
strcasecmp_m() never needs to call to talloc, and via next_codepoint()
still has an ASCII fast-path bypassing iconv() calls.
Andrew Bartlett
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/lanman.c | 6 | ||||
| -rw-r--r-- | source3/smbd/server.c | 4 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index 56cfb66c58..b012e09f5e 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -1427,7 +1427,7 @@ static int fill_srv_info(struct srv_info_struct *service, static int srv_comp(struct srv_info_struct *s1,struct srv_info_struct *s2) { - return StrCaseCmp(s1->name,s2->name); + return strcasecmp_m(s1->name,s2->name); } /**************************************************************************** @@ -1596,7 +1596,7 @@ static int srv_name_match(const char *n1, const char *n2) * the server will return a list of servers that exist on * the network greater than or equal to the FirstNameToReturn. */ - int ret = StrCaseCmp(n1, n2); + int ret = strcasecmp_m(n1, n2); if (ret <= 0) { return 0; @@ -1708,7 +1708,7 @@ static bool api_RNetServerEnum3(struct smbd_server_connection *sconn, */ for (;first > 0;) { int ret; - ret = StrCaseCmp(first_name, + ret = strcasecmp_m(first_name, servers[first-1].name); if (ret > 0) { break; diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 29acf8d221..4125aebeb4 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -1202,7 +1202,7 @@ extern void build_options(bool screen); rpcsrv_type = lp_parm_const_string(GLOBAL_SECTION_SNUM, "rpc_server", "epmapper", "none"); - if (StrCaseCmp(rpcsrv_type, "daemon") == 0) { + if (strcasecmp_m(rpcsrv_type, "daemon") == 0) { start_epmd(smbd_event_context(), smbd_server_conn->msg_ctx); } @@ -1235,7 +1235,7 @@ extern void build_options(bool screen); rpcsrv_type = lp_parm_const_string(GLOBAL_SECTION_SNUM, "rpc_server", "spoolss", "embedded"); - if (StrCaseCmp(rpcsrv_type, "daemon") == 0) { + if (strcasecmp_m(rpcsrv_type, "daemon") == 0) { start_spoolssd(smbd_event_context(), smbd_messaging_context()); } diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 75d0a41e6b..6eae9a5764 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -1219,7 +1219,7 @@ static bool exact_match(bool has_wild, if (case_sensitive) { return strcmp(str,mask)==0; } else { - return StrCaseCmp(str,mask) == 0; + return strcasecmp_m(str,mask) == 0; } } |