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)

8 files changed, 76 insertions, 83 deletions

diff --git a/source3/nmbd/nmbd_browserdb.c b/source3/nmbd/nmbd_browserdb.c
index d7c852605e..4a302ddfd4 100644
--- a/source3/nmbd/nmbd_browserdb.c
+++ b/source3/nmbd/nmbd_browserdb.c
@@ -37,7 +37,6 @@
 
 ubi_dlNewList( lmb_browserlist );
 
-
 /* -------------------------------------------------------------------------- **
  * Functions...
  */
@@ -52,9 +51,9 @@ ubi_dlNewList( lmb_browserlist );
  * ************************************************************************** **
  */
 static void remove_lmb_browser_entry( struct browse_cache_record *browc )
-  {
-  safe_free( ubi_dlRemThis( lmb_browserlist, browc ) );
-  } /* remove_lmb_browser_entry */
+{
+	safe_free( ubi_dlRemThis( lmb_browserlist, browc ) );
+}
 
 /* ************************************************************************** **
  * Update a browser death time.
@@ -65,10 +64,10 @@ static void remove_lmb_browser_entry( struct browse_cache_record *browc )
  * ************************************************************************** **
  */
 void update_browser_death_time( struct browse_cache_record *browc )
-  {
-  /* Allow the new lmb to miss an announce period before we remove it. */
-  browc->death_time = time(NULL) + ( (CHECK_TIME_MST_ANNOUNCE + 2) * 60 );
-  } /* update_browser_death_time */
+{
+	/* Allow the new lmb to miss an announce period before we remove it. */
+	browc->death_time = time(NULL) + ( (CHECK_TIME_MST_ANNOUNCE + 2) * 60 );
+}
 
 /* ************************************************************************** **
  * Create a browser entry and add it to the local master browser list.
@@ -84,48 +83,47 @@ void update_browser_death_time( struct browse_cache_record *browc )
 struct browse_cache_record *create_browser_in_lmb_cache( char *work_name, 
                                                          char *browser_name, 
                                                          struct in_addr ip )
-  {
-  struct browse_cache_record *browc;
-  time_t now = time( NULL );
+{
+	struct browse_cache_record *browc;
+	time_t now = time( NULL );
 
-  browc = (struct browse_cache_record *)malloc( sizeof( *browc ) );
+	browc = (struct browse_cache_record *)malloc( sizeof( *browc ) );
 
-  if( NULL == browc )
-    {
-    DEBUG( 0, ("create_browser_in_lmb_cache: malloc fail !\n") );
-    return( NULL );
-    }
+	if( NULL == browc ) {
+		DEBUG( 0, ("create_browser_in_lmb_cache: malloc fail !\n") );
+		return( NULL );
+	}
 
-  memset( (char *)browc, '\0', sizeof( *browc ) );
+	memset( (char *)browc, '\0', sizeof( *browc ) );
   
-  /* For a new lmb entry we want to sync with it after one minute. This
-     will allow it time to send out a local announce and build its
-     browse list.
-   */
-  browc->sync_time = now + 60;
-
-  /* Allow the new lmb to miss an announce period before we remove it. */
-  browc->death_time = now + ( (CHECK_TIME_MST_ANNOUNCE + 2) * 60 );
-
-  pstrcpy(  browc->lmb_name, browser_name);
-  pstrcpy(  browc->work_group, work_name);
-  strupper( browc->lmb_name );
-  strupper( browc->work_group );
+	/* For a new lmb entry we want to sync with it after one minute. This
+	 will allow it time to send out a local announce and build its
+	 browse list.
+	*/
+
+	browc->sync_time = now + 60;
+
+	/* Allow the new lmb to miss an announce period before we remove it. */
+	browc->death_time = now + ( (CHECK_TIME_MST_ANNOUNCE + 2) * 60 );
+
+	pstrcpy(  browc->lmb_name, browser_name);
+	pstrcpy(  browc->work_group, work_name);
+	strupper_m( browc->lmb_name );
+	strupper_m( browc->work_group );
   
-  browc->ip = ip;
+	browc->ip = ip;
  
-  (void)ubi_dlAddTail( lmb_browserlist, browc );
-
-  if( DEBUGLVL( 3 ) )
-    {
-    Debug1( "nmbd_browserdb:create_browser_in_lmb_cache()\n" );
-    Debug1( "  Added lmb cache entry for workgroup %s ", browc->work_group );
-    Debug1( "name %s IP %s ", browc->lmb_name, inet_ntoa(ip) );
-    Debug1( "ttl %d\n", (int)browc->death_time );
-    }
+	(void)ubi_dlAddTail( lmb_browserlist, browc );
+
+	if( DEBUGLVL( 3 ) ) {
+		Debug1( "nmbd_browserdb:create_browser_in_lmb_cache()\n" );
+		Debug1( "  Added lmb cache entry for workgroup %s ", browc->work_group );
+		Debug1( "name %s IP %s ", browc->lmb_name, inet_ntoa(ip) );
+		Debug1( "ttl %d\n", (int)browc->death_time );
+	}
   
-  return( browc );
-  } /* create_browser_in_lmb_cache */
+	return( browc );
+}
 
 /* ************************************************************************** **
  * Find a browser entry in the local master browser list.
@@ -137,17 +135,16 @@ struct browse_cache_record *create_browser_in_lmb_cache( char *work_name,
  * ************************************************************************** **
  */
 struct browse_cache_record *find_browser_in_lmb_cache( char *browser_name )
-  {
-  struct browse_cache_record *browc;
+{
+	struct browse_cache_record *browc;
 
-  for( browc = (struct browse_cache_record *)ubi_dlFirst( lmb_browserlist );
-       browc;
-       browc = (struct browse_cache_record *)ubi_dlNext( browc ) )
-    if( strequal( browser_name, browc->lmb_name ) )
-      break;
+	for( browc = (struct browse_cache_record *)ubi_dlFirst( lmb_browserlist );
+			browc; browc = (struct browse_cache_record *)ubi_dlNext( browc ) )
+		if( strequal( browser_name, browc->lmb_name ) )
+			break;
 
-  return( browc );
-  } /* find_browser_in_lmb_cache */
+	return( browc );
+}
 
 /* ************************************************************************** **
  *  Expire timed out browsers in the browserlist.
@@ -159,24 +156,20 @@ struct browse_cache_record *find_browser_in_lmb_cache( char *browser_name )
  * ************************************************************************** **
  */
 void expire_lmb_browsers( time_t t )
-  {
-  struct browse_cache_record *browc;
-  struct browse_cache_record *nextbrowc;
-
-  for( browc = (struct browse_cache_record *)ubi_dlFirst( lmb_browserlist );
-       browc;
-       browc = nextbrowc )
-    {
-    nextbrowc = (struct browse_cache_record *)ubi_dlNext( browc );
-
-    if( browc->death_time < t )
-      {
-      if( DEBUGLVL( 3 ) )
-        {
-        Debug1( "nmbd_browserdb:expire_lmb_browsers()\n" );
-        Debug1( "  Removing timed out lmb entry %s\n", browc->lmb_name );
-        }
-      remove_lmb_browser_entry( browc );
-      }
-    }
-  } /* expire_lmb_browsers */
+{
+	struct browse_cache_record *browc;
+	struct browse_cache_record *nextbrowc;
+
+	for( browc = (struct browse_cache_record *)ubi_dlFirst( lmb_browserlist );
+			browc; browc = nextbrowc ) {
+		nextbrowc = (struct browse_cache_record *)ubi_dlNext( browc );
+
+		if( browc->death_time < t ) {
+			if( DEBUGLVL( 3 ) ) {
+				Debug1( "nmbd_browserdb:expire_lmb_browsers()\n" );
+				Debug1( "  Removing timed out lmb entry %s\n", browc->lmb_name );
+			}
+			remove_lmb_browser_entry( browc );
+		}
+	}
+}
diff --git a/source3/nmbd/nmbd_browsesync.c b/source3/nmbd/nmbd_browsesync.c
index 381f65e0c8..26d4735744 100644
--- a/source3/nmbd/nmbd_browsesync.c
+++ b/source3/nmbd/nmbd_browsesync.c
@@ -127,7 +127,7 @@ static void announce_local_master_browser_to_domain_master_browser( struct work_
   p++;
 
   fstrcpy(myname, global_myname());
-  strupper(myname);
+  strupper_m(myname);
   myname[15]='\0';
   push_pstring_base(p, myname, outbuf);
 
diff --git a/source3/nmbd/nmbd_elections.c b/source3/nmbd/nmbd_elections.c
index 339a27d207..b948eb9d04 100644
--- a/source3/nmbd/nmbd_elections.c
+++ b/source3/nmbd/nmbd_elections.c
@@ -48,7 +48,7 @@ static void send_election_dgram(struct subnet_record *subrec, const char *workgr
   SIVAL(p,5,timeup*1000); /* ms - Despite what the spec says. */
   p += 13;
   pstrcpy_base(p, server_name, outbuf);
-  strupper(p);
+  strupper_m(p);
   p = skip_string(p,1);
   
   send_mailslot(False, BROWSE_MAILSLOT, outbuf, PTR_DIFF(p,outbuf),
diff --git a/source3/nmbd/nmbd_incomingdgrams.c b/source3/nmbd/nmbd_incomingdgrams.c
index 16fecbccd9..80465ada0d 100644
--- a/source3/nmbd/nmbd_incomingdgrams.c
+++ b/source3/nmbd/nmbd_incomingdgrams.c
@@ -580,7 +580,7 @@ static void send_backup_list_response(struct subnet_record *subrec,
   /* We always return at least one name - our own. */
   count = 1;
   fstrcpy(myname, global_myname());
-  strupper(myname);
+  strupper_m(myname);
   myname[15]='\0';
   push_pstring_base(p, myname, outbuf);
 
@@ -614,7 +614,7 @@ static void send_backup_list_response(struct subnet_record *subrec,
       continue;
 
     StrnCpy(p, servrec->serv.name, 15);
-    strupper(p);
+    strupper_m(p);
     count++;
 
     DEBUG(5,("send_backup_list_response: Adding server %s number %d\n",
diff --git a/source3/nmbd/nmbd_incomingrequests.c b/source3/nmbd/nmbd_incomingrequests.c
index a8168566f1..a3faf5e104 100644
--- a/source3/nmbd/nmbd_incomingrequests.c
+++ b/source3/nmbd/nmbd_incomingrequests.c
@@ -364,7 +364,7 @@ subnet %s - name not found.\n", nmb_namestr(&nmb->question.question_name),
         /* Start with the name. */
         memset(buf,'\0',18);
         slprintf(buf, 17, "%-15.15s",namerec->name.name);
-        strupper(buf);
+        strupper_m(buf);
         
         /* Put the name type and netbios flags in the buffer. */
         buf[15] = name_type;
diff --git a/source3/nmbd/nmbd_namelistdb.c b/source3/nmbd/nmbd_namelistdb.c
index 932d926a91..3f6d2f3b64 100644
--- a/source3/nmbd/nmbd_namelistdb.c
+++ b/source3/nmbd/nmbd_namelistdb.c
@@ -49,8 +49,8 @@ static void upcase_name( struct nmb_name *target, struct nmb_name *source )
   if( NULL != source )
     (void)memcpy( target, source, sizeof( struct nmb_name ) );
 
-  strupper( target->name );
-  strupper( target->scope );
+  strupper_m( target->name );
+  strupper_m( target->scope );
 
   /* fudge... We're using a byte-by-byte compare, so we must be sure that
    * unused space doesn't have garbage in it.
diff --git a/source3/nmbd/nmbd_sendannounce.c b/source3/nmbd/nmbd_sendannounce.c
index 8501acf9ba..353717ee62 100644
--- a/source3/nmbd/nmbd_sendannounce.c
+++ b/source3/nmbd/nmbd_sendannounce.c
@@ -142,7 +142,7 @@ static void send_lm_announcement(struct subnet_record *subrec, int announce_type
 
   p += 10;
   /*StrnCpy(p,server_name,15);
-  strupper(p);
+  strupper_m(p);
   p = skip_string(p,1);
   pstrcpy(p,server_comment);
   p = skip_string(p,1);*/
@@ -591,7 +591,7 @@ for workgroup %s on subnet %s.\n", lp_workgroup(), FIRST_SUBNET->subnet_name ));
   p++;
 
   fstrcpy(myname, global_myname());
-  strupper(myname);
+  strupper_m(myname);
   myname[15]='\0';
   push_pstring_base(p, myname, outbuf);
 
diff --git a/source3/nmbd/nmbd_serverlistdb.c b/source3/nmbd/nmbd_serverlistdb.c
index e99599e16f..2484a7f830 100644
--- a/source3/nmbd/nmbd_serverlistdb.c
+++ b/source3/nmbd/nmbd_serverlistdb.c
@@ -155,7 +155,7 @@ workgroup %s. This is a bug.\n", name, work->work_group));
  
   fstrcpy(servrec->serv.name,name);
   fstrcpy(servrec->serv.comment,comment);
-  strupper(servrec->serv.name);
+  strupper_m(servrec->serv.name);
   servrec->serv.type  = servertype;
 
   update_server_ttl(servrec, ttl);