From 94f59f54921174fc156fade575ca114d331b1bd8 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 5 Sep 2003 19:59:55 +0000
Subject: More tuning from cachegrind. Change most trim_string() calls to
 trim_char(0, as that's what they do. Fix string_replace() to fast-path ascii.
 Jeremy. (This used to be commit f35e9a8b909d3c74be47083ccc4a4e91a14938db)

---
 source3/auth/auth.c        | 4 ++--
 source3/auth/auth_rhosts.c | 2 +-
 source3/auth/pampass.c     | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'source3/auth')

diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index 668bba0d64..553d9a686e 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -373,10 +373,10 @@ BOOL load_auth_module(struct auth_context *auth_context,
 	if (p) {
 		*p = 0;
 		module_params = p+1;
-		trim_string(module_params, " ", " ");
+		trim_char(module_params, ' ', ' ');
 	}
 	
-	trim_string(module_name, " ", " ");
+	trim_char(module_name, ' ', ' ');
 	
 	entry = auth_find_backend_entry(module_name);
 	
diff --git a/source3/auth/auth_rhosts.c b/source3/auth/auth_rhosts.c
index fab2d551f2..b295df9328 100644
--- a/source3/auth/auth_rhosts.c
+++ b/source3/auth/auth_rhosts.c
@@ -40,7 +40,7 @@ static BOOL check_user_equiv(const char *user, const char *remote, const char *e
   if (! lines) return False;
   for (i=0; lines[i]; i++) {
     char *buf = lines[i];
-    trim_string(buf," "," ");
+    trim_char(buf,' ',' ');
 
     if (buf[0] != '#' && buf[0] != '\n') 
     {
diff --git a/source3/auth/pampass.c b/source3/auth/pampass.c
index d666e439b0..3239686a20 100644
--- a/source3/auth/pampass.c
+++ b/source3/auth/pampass.c
@@ -230,7 +230,7 @@ static struct chat_struct *make_pw_chat(char *p)
 		special_char_sub(prompt);
 		fstrcpy(t->prompt, prompt);
 		strlower_m(t->prompt);
-		trim_string(t->prompt, " ", " ");
+		trim_char(t->prompt, ' ', ' ');
 
 		if (!next_token(&p, reply, NULL, sizeof(fstring)))
 			break;
@@ -241,7 +241,7 @@ static struct chat_struct *make_pw_chat(char *p)
 		special_char_sub(reply);
 		fstrcpy(t->reply, reply);
 		strlower_m(t->reply);
-		trim_string(t->reply, " ", " ");
+		trim_char(t->reply, ' ', ' ');
 
 	}
 	return list;
@@ -304,7 +304,7 @@ static int smb_pam_passchange_conv(int num_msg,
 		case PAM_PROMPT_ECHO_ON:
 			DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_ON: PAM said: %s\n", msg[replies]->msg));
 			fstrcpy(current_prompt, msg[replies]->msg);
-			trim_string(current_prompt, " ", " ");
+			trim_char(current_prompt, ' ', ' ');
 			for (t=pw_chat; t; t=t->next) {
 
 				DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_ON: trying to match |%s| to |%s|\n",
@@ -335,7 +335,7 @@ static int smb_pam_passchange_conv(int num_msg,
 		case PAM_PROMPT_ECHO_OFF:
 			DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: PAM said: %s\n", msg[replies]->msg));
 			fstrcpy(current_prompt, msg[replies]->msg);
-			trim_string(current_prompt, " ", " ");
+			trim_char(current_prompt, ' ', ' ');
 			for (t=pw_chat; t; t=t->next) {
 
 				DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: trying to match |%s| to |%s|\n",
-- 
cgit