Removed strupper/strlower macros that automatically map to strupper_m/strlower_m.

I really want people to think about when they're using multibyte strings.
Jeremy.
(This used to be commit ff222716a08af65d26ad842ce4c2841cc6540959)

5 files changed, 24 insertions, 24 deletions

diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 55cf73d2b1..4e9c2c1592 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -387,7 +387,7 @@ size_t push_ascii(void *dest, const char *src, size_t dest_len, int flags)
 
 	if (flags & STR_UPPER) {
 		pstrcpy(tmpbuf, src);
-		strupper(tmpbuf);
+		strupper_m(tmpbuf);
 		src = tmpbuf;
 	}
 
@@ -488,7 +488,7 @@ size_t push_ucs2(const void *base_ptr, void *dest, const char *src, size_t dest_
 
 	if (flags & STR_UPPER) {
 		pstrcpy(tmpbuf, src);
-		strupper(tmpbuf);
+		strupper_m(tmpbuf);
 		src = tmpbuf;
 	}
 
@@ -566,7 +566,7 @@ static size_t push_utf8(void *dest, const char *src, size_t dest_len, int flags)
 
 	if (flags & STR_UPPER) {
 		pstrcpy(tmpbuf, src);
-		strupper(tmpbuf);
+		strupper_m(tmpbuf);
 		src = tmpbuf;
 	}
 
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index a53a50a060..ac2cf687c4 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -58,7 +58,7 @@ void set_local_machine_name(const char* local_name, BOOL perm)
 
 	fstrcpy(tmp_local_machine,local_name);
 	trim_string(tmp_local_machine," "," ");
-	strlower(tmp_local_machine);
+	strlower_m(tmp_local_machine);
 	alpha_strcpy(local_machine,tmp_local_machine,SAFE_NETBIOS_CHARS,sizeof(local_machine)-1);
 }
 
@@ -80,7 +80,7 @@ void set_remote_machine_name(const char* remote_name, BOOL perm)
 
 	fstrcpy(tmp_remote_machine,remote_name);
 	trim_string(tmp_remote_machine," "," ");
-	strlower(tmp_remote_machine);
+	strlower_m(tmp_remote_machine);
 	alpha_strcpy(remote_machine,tmp_remote_machine,SAFE_NETBIOS_CHARS,sizeof(remote_machine)-1);
 }
 
@@ -111,7 +111,7 @@ void sub_set_smb_name(const char *name)
 
 	fstrcpy(tmp,name);
 	trim_string(tmp," "," ");
-	strlower(tmp);
+	strlower_m(tmp);
 	alpha_strcpy(smb_user_name,tmp,SAFE_NETBIOS_CHARS,sizeof(smb_user_name)-1);
 }
 
@@ -331,7 +331,7 @@ void standard_sub_basic(const char *smb_name, char *str,size_t len)
 		switch (*(p+1)) {
 		case 'U' : 
 			fstrcpy(tmp_str, smb_name);
-			strlower(tmp_str);
+			strlower_m(tmp_str);
 			string_sub(p,"%U",tmp_str,l);
 			break;
 		case 'G' :
@@ -344,7 +344,7 @@ void standard_sub_basic(const char *smb_name, char *str,size_t len)
 			break;
 		case 'D' :
 			fstrcpy(tmp_str, current_user_info.domain);
-			strupper(tmp_str);
+			strupper_m(tmp_str);
 			string_sub(p,"%D", tmp_str,l);
 			break;
 		case 'I' :
@@ -357,7 +357,7 @@ void standard_sub_basic(const char *smb_name, char *str,size_t len)
 				pstring temp_name;
 
 				pstrcpy(temp_name, global_myname());
-				strlower(temp_name);
+				strlower_m(temp_name);
 				string_sub(p,"%L", temp_name,l); 
 			}
 			break;
diff --git a/source3/lib/username.c b/source3/lib/username.c
index 0005372a8f..98b8f33aae 100644
--- a/source3/lib/username.c
+++ b/source3/lib/username.c
@@ -219,7 +219,7 @@ static struct passwd *Get_Pwnam_internals(const char *user, char *user2)
 
 	/* Try in all lower case first as this is the most 
 	   common case on UNIX systems */
-	strlower(user2);
+	strlower_m(user2);
 	DEBUG(5,("Trying _Get_Pwnam(), username as lowercase is %s\n",user2));
 	ret = getpwnam_alloc(user2);
 	if(ret)
@@ -234,7 +234,7 @@ static struct passwd *Get_Pwnam_internals(const char *user, char *user2)
 	}
 
 	/* Try as uppercase, if username wasn't originally uppercase */
-	strupper(user2);
+	strupper_m(user2);
 	if(strcmp(user, user2) != 0) {
 		DEBUG(5,("Trying _Get_Pwnam(), username as uppercase is %s\n", user2));
 		ret = getpwnam_alloc(user2);
@@ -243,7 +243,7 @@ static struct passwd *Get_Pwnam_internals(const char *user, char *user2)
 	}
 
 	/* Try all combinations up to usernamelevel */
-	strlower(user2);
+	strlower_m(user2);
 	DEBUG(5,("Checking combinations of %d uppercase letters in %s\n", lp_usernamelevel(), user2));
 	ret = uname_string_combinations(user2, getpwnam_alloc, lp_usernamelevel());
 
diff --git a/source3/lib/util.c b/source3/lib/util.c
index a99e2163db..0a2b86ab57 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -99,7 +99,7 @@ BOOL set_global_myname(const char *myname)
 	smb_myname = strdup(myname);
 	if (!smb_myname)
 		return False;
-	strupper(smb_myname);
+	strupper_m(smb_myname);
 	return True;
 }
 
@@ -118,7 +118,7 @@ BOOL set_global_myworkgroup(const char *myworkgroup)
 	smb_myworkgroup = strdup(myworkgroup);
 	if (!smb_myworkgroup)
 		return False;
-	strupper(smb_myworkgroup);
+	strupper_m(smb_myworkgroup);
 	return True;
 }
 
@@ -137,7 +137,7 @@ BOOL set_global_scope(const char *scope)
 	smb_scope = strdup(scope);
 	if (!smb_scope)
 		return False;
-	strupper(smb_scope);
+	strupper_m(smb_scope);
 	return True;
 }
 
@@ -184,7 +184,7 @@ static BOOL set_my_netbios_names(const char *name, int i)
 	smb_my_netbios_names[i] = strdup(name);
 	if (!smb_my_netbios_names[i])
 		return False;
-	strupper(smb_my_netbios_names[i]);
+	strupper_m(smb_my_netbios_names[i]);
 	return True;
 }
 
@@ -265,7 +265,7 @@ BOOL init_names(void)
 	p = strchr( local_machine, ' ' );
 	if (p)
 		*p = 0;
-	strlower( local_machine );
+	strlower_m( local_machine );
 
 	DEBUG( 5, ("Netbios name list:-\n") );
 	for( n=0; my_netbios_names(n); n++ )
@@ -2336,8 +2336,8 @@ BOOL mask_match(const char *string, char *pattern, BOOL is_case_sensitive)
 
 	fstrcpy(p2, pattern);
 	fstrcpy(s2, string);
-	strlower(p2); 
-	strlower(s2);
+	strlower_m(p2); 
+	strlower_m(s2);
 	return ms_fnmatch(p2, s2, Protocol) == 0;
 }
 
@@ -2453,8 +2453,8 @@ BOOL unix_wild_match(const char *pattern, const char *string)
 
 	pstrcpy(p2, pattern);
 	pstrcpy(s2, string);
-	strlower(p2);
-	strlower(s2);
+	strlower_m(p2);
+	strlower_m(s2);
 
 	/* Remove any *? and ** from the pattern as they are meaningless */
 	for(p = p2; *p; p++)
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index ac8fccfa5a..96fbc3f124 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -314,7 +314,7 @@ char *strupper_static(const char *s)
 	static pstring str;
 
 	pstrcpy(str, s);
-	strupper(str);
+	strupper_m(str);
 
 	return str;
 }
@@ -327,9 +327,9 @@ void strnorm(char *s)
 {
 	extern int case_default;
 	if (case_default == CASE_UPPER)
-		strupper(s);
+		strupper_m(s);
 	else
-		strlower(s);
+		strlower_m(s);
 }
 
 /**