rtlib: optimization of [L/R]TrimAny function code

skyfish4tb · jayrm · commit c0bdc2d7d6f4 · 2019-05-04T21:58:46.000-04:00
diff --git a/src/rtlib/str_ltrimany.c b/src/rtlib/str_ltrimany.c
@@ -30,15 +30,8 @@ FBCALL FBSTRING *fb_LTrimAny
 		{
 			while ( len != 0 )
 	        {
-			ssize_t i;
-	            for( i=0; i!=len_pattern; ++i ) 
-	            {
-	                if( FB_MEMCHR( pattern->data, *pachText, len_pattern )!=NULL )
-	                    break;
-	            }
-	            
-	            if( i==len_pattern )
-	                break;
+	           if( FB_MEMCHR( pattern->data, *pachText, len_pattern )==NULL )
+	              break;
 
 	            --len;
 	            ++pachText;
diff --git a/src/rtlib/str_rtrimany.c b/src/rtlib/str_rtrimany.c
@@ -25,15 +25,8 @@ FBCALL FBSTRING *fb_RTrimAny( FBSTRING *src, FBSTRING *pattern )
 		{
 			while ( len != 0 )
 	        {
-			ssize_t i;
 	            --len;
-	            for( i=0; i!=len_pattern; ++i ) 
-	            {
-	                if( FB_MEMCHR( pattern->data, pachText[len], len_pattern )!=NULL )
-	                    break;
-	            }
-	            
-	            if( i==len_pattern ) 
+	            if( FB_MEMCHR( pattern->data, pachText[len], len_pattern )==NULL ) 
 	            {
 	                ++len;
 	                break;
diff --git a/src/rtlib/str_trimany.c b/src/rtlib/str_trimany.c
@@ -26,30 +26,16 @@ FBCALL FBSTRING *fb_TrimAny( FBSTRING *src, FBSTRING *pattern )
 		{
 			while ( len != 0 )
 	        {
-	            ssize_t i;
-	            for( i=0; i!=len_pattern; ++i ) 
-	            {
-	                if( FB_MEMCHR( pattern->data, *pachText, len_pattern )!=NULL )
-	                    break;
-	            }
-	            
-	            if( i==len_pattern )
+	            if( FB_MEMCHR( pattern->data, *pachText, len_pattern )==NULL )
 	                break;
 
 	            --len;
 	            ++pachText;
 			}
 			while ( len != 0 )
 	        {
-	            ssize_t i;
 	            --len;
-	            for( i=0; i!=len_pattern; ++i ) 
-	            {
-	                if( FB_MEMCHR( pattern->data, pachText[len], len_pattern )!=NULL )
-	                    break;
-	            }
-	            
-	            if( i==len_pattern ) 
+	            if( FB_MEMCHR( pattern->data, pachText[len], len_pattern )==NULL ) 
 	            {
 	                ++len;
 	                break;
diff --git a/src/rtlib/strw_ltrimany.c b/src/rtlib/strw_ltrimany.c
@@ -16,20 +16,17 @@ FBCALL FB_WCHAR *fb_WstrLTrimAny ( const FB_WCHAR *src, const FB_WCHAR *pattern
     {
         ssize_t len_pattern = fb_wstr_Len( pattern );
         pachText = src;
-		while ( len != 0 )
-        {
-            ssize_t i;
-            for( i=0; i!=len_pattern; ++i ) {
-                if( wcschr( pattern, *pachText )!=NULL ) {
-                    break;
-                }
-            }
-            if( i==len_pattern ) {
-                break;
-            }
-            --len;
-            ++pachText;
-		}
+				if( len_pattern != 0 )
+				{
+					while ( len != 0 )
+							{
+									if( wcschr( pattern, *pachText )==NULL ) {
+											break;
+									}
+									--len;
+									++pachText;
+					}
+				}
 	}
 
 	if( len > 0 )
diff --git a/src/rtlib/strw_rtrimany.c b/src/rtlib/strw_rtrimany.c
@@ -16,20 +16,17 @@ FBCALL FB_WCHAR *fb_WstrRTrimAny ( const FB_WCHAR *src, const FB_WCHAR *pattern
     {
         ssize_t len_pattern = fb_wstr_Len( pattern );
         pachText = src;
-		while ( len != 0 )
-        {
-            ssize_t i;
-            --len;
-            for( i=0; i!=len_pattern; ++i ) {
-                if( wcschr( pattern, pachText[len] )!=NULL ) {
+		    if( len_pattern != 0 )
+		    {
+		        while ( len != 0 )
+            {
+                --len;
+                if( wcschr( pattern, pachText[len] )==NULL ) {
+                    ++len;
                     break;
                 }
-            }
-            if( i==len_pattern ) {
-                ++len;
-                break;
-            }
-		}
+		        }
+		    }
 	}
 
 	if( len > 0 )
diff --git a/src/rtlib/strw_trimany.c b/src/rtlib/strw_trimany.c
@@ -17,34 +17,25 @@ FBCALL FB_WCHAR *fb_WstrTrimAny ( const FB_WCHAR *src, const FB_WCHAR *pattern )
         ssize_t len_pattern = fb_wstr_Len( pattern );
         pachText = src;
         len = fb_wstr_Len( src );
-		while ( len != 0 )
-        {
-            ssize_t i;
-            for( i=0; i!=len_pattern; ++i ) {
-                if( wcschr( pattern, *pachText )!=NULL ) {
-                    break;
-                }
-            }
-            if( i==len_pattern ) {
-                break;
-            }
-            --len;
-            ++pachText;
-		}
-		while ( len != 0 )
-        {
-            ssize_t i;
-            --len;
-            for( i=0; i!=len_pattern; ++i ) {
-                if( wcschr( pattern, pachText[len] )!=NULL ) {
-                    break;
-                }
-            }
-            if( i==len_pattern ) {
-                ++len;
-                break;
-            }
-		}
+		    if( len_pattern != 0 )
+		    {
+					while ( len != 0 )
+							{
+									if( wcschr( pattern, *pachText )==NULL ) {
+											break;
+									}
+									--len;
+									++pachText;
+					}
+					while ( len != 0 )
+							{
+									--len;
+									if( wcschr( pattern, pachText[len] )==NULL ) {
+											++len;
+											break;
+									}
+					}
+				}
 	}
 
 	if( len > 0 )

Original file line number	Diff line number	Diff line change
`@@ -25,15 +25,8 @@ FBCALL FBSTRING fb_RTrimAny( FBSTRING src, FBSTRING *pattern )`
`25`	`25`	`{`
`26`	`26`	`while ( len != 0 )`
`27`	`27`	`{`
`28`		`- ssize_t i;`
`29`	`28`	`--len;`
`30`		`- for( i=0; i!=len_pattern; ++i )`
`31`		`- {`
`32`		`- if( FB_MEMCHR( pattern->data, pachText[len], len_pattern )!=NULL )`
`33`		`- break;`
`34`		`- }`
`35`		`-`
`36`		`- if( i==len_pattern )`
	`29`	`+ if( FB_MEMCHR( pattern->data, pachText[len], len_pattern )==NULL )`
`37`	`30`	`{`
`38`	`31`	`++len;`
`39`	`32`	`break;`