Skip to content

Commit b3e3528

Browse files
jayrmjayrm
committed
rtlib: whitespace clean up for LTRIM/RTRIM/TRIM functions
1 parent 7970765 commit b3e3528

File tree

5 files changed

+96
-96
lines changed

5 files changed

+96
-96
lines changed

‎src/rtlib/strw_ltrim.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ FBCALL FB_WCHAR *fb_WstrLTrim ( const FB_WCHAR *src )
1919
return NULL;
2020

2121
/* alloc temp string */
22-
dst = fb_wstr_AllocTemp( len );
22+
dst = fb_wstr_AllocTemp( len );
2323
if( dst != NULL )
2424
fb_wstr_Copy( dst, p, len );
2525

‎src/rtlib/strw_ltrimex.c‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,48 @@
44

55
FBCALL FB_WCHAR *fb_WstrLTrimEx ( const FB_WCHAR *src, const FB_WCHAR *pattern )
66
{
7-
FB_WCHAR *dst;
7+
FB_WCHAR *dst;
88
ssize_t len;
99
const FB_WCHAR *p = src;
1010

11-
if( src == NULL ) {
12-
return NULL;
13-
}
11+
if( src == NULL ) {
12+
return NULL;
13+
}
1414

15-
{
16-
ssize_t len_pattern = fb_wstr_Len( pattern );
17-
len = fb_wstr_Len( src );
18-
if( len >= len_pattern ) {
19-
if( len_pattern==1 ) {
20-
p = fb_wstr_SkipChar( src,
21-
len,
22-
*pattern );
23-
len -= fb_wstr_CalcDiff( src, p );
15+
{
16+
ssize_t len_pattern = fb_wstr_Len( pattern );
17+
len = fb_wstr_Len( src );
18+
if( len >= len_pattern ) {
19+
if( len_pattern==1 ) {
20+
p = fb_wstr_SkipChar( src,
21+
len,
22+
*pattern );
23+
len -= fb_wstr_CalcDiff( src, p );
2424

25-
} else if( len_pattern != 0 ) {
26-
p = src;
27-
while (len >= len_pattern ) {
28-
if( fb_wstr_Compare( p, pattern, len_pattern )!=0 )
29-
break;
30-
p += len_pattern;
31-
len -= len_pattern;
32-
}
33-
}
34-
}
25+
} else if( len_pattern != 0 ) {
26+
p = src;
27+
while (len >= len_pattern ) {
28+
if( fb_wstr_Compare( p, pattern, len_pattern )!=0 )
29+
break;
30+
p += len_pattern;
31+
len -= len_pattern;
32+
}
33+
}
34+
}
3535
}
3636

3737
if( len > 0 )
3838
{
3939
/* alloc temp string */
40-
dst = fb_wstr_AllocTemp( len );
40+
dst = fb_wstr_AllocTemp( len );
4141
if( dst != NULL )
4242
{
4343
/* simple copy */
4444
fb_wstr_Copy( dst, p, len );
4545
}
4646
else
4747
dst = NULL;
48-
}
48+
}
4949
else
5050
dst = NULL;
5151

‎src/rtlib/strw_rtrim.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FBCALL FB_WCHAR *fb_WstrRTrim ( const FB_WCHAR *src )
2121
return NULL;
2222

2323
/* alloc temp string */
24-
dst = fb_wstr_AllocTemp( chars );
24+
dst = fb_wstr_AllocTemp( chars );
2525
if( dst != NULL )
2626
{
2727
/* simple copy */

‎src/rtlib/strw_rtrimex.c‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,54 +4,54 @@
44

55
FBCALL FB_WCHAR *fb_WstrRTrimEx ( const FB_WCHAR *src, const FB_WCHAR *pattern )
66
{
7-
FB_WCHAR *dst;
7+
FB_WCHAR *dst;
88
ssize_t len;
99
const FB_WCHAR *p = src;
1010

11-
if( src == NULL ) {
12-
return NULL;
13-
}
11+
if( src == NULL ) {
12+
return NULL;
13+
}
1414

1515
{
1616
ssize_t len_pattern = fb_wstr_Len( pattern );
1717
len = fb_wstr_Len( src );
1818
if( len >= len_pattern )
1919
{
20-
if( len_pattern==1 ) {
21-
p = fb_wstr_SkipCharRev( src,
22-
len,
23-
*pattern );
24-
len = fb_wstr_CalcDiff( src, p );
20+
if( len_pattern==1 ) {
21+
p = fb_wstr_SkipCharRev( src,
22+
len,
23+
*pattern );
24+
len = fb_wstr_CalcDiff( src, p );
2525

26-
} else if( len_pattern != 0 ) {
27-
ssize_t test_index = len - len_pattern;
28-
p = src;
29-
while (len >= len_pattern ) {
30-
if( fb_wstr_Compare( p + test_index,
31-
pattern,
32-
len_pattern )!=0 )
33-
break;
34-
test_index -= len_pattern;
35-
}
36-
len = test_index + len_pattern;
37-
}
26+
} else if( len_pattern != 0 ) {
27+
ssize_t test_index = len - len_pattern;
28+
p = src;
29+
while (len >= len_pattern ) {
30+
if( fb_wstr_Compare( p + test_index,
31+
pattern,
32+
len_pattern )!=0 )
33+
break;
34+
test_index -= len_pattern;
35+
}
36+
len = test_index + len_pattern;
37+
}
3838
}
39-
}
39+
}
4040

4141
if( len > 0 )
4242
{
4343
/* alloc temp string */
44-
dst = fb_wstr_AllocTemp( len );
44+
dst = fb_wstr_AllocTemp( len );
4545
if( dst != NULL )
4646
{
4747
/* simple copy */
4848
fb_wstr_Copy( dst, src, len );
4949
}
5050
else
5151
dst = NULL;
52-
}
52+
}
5353
else
5454
dst = NULL;
5555

56-
return dst;
56+
return dst;
5757
}

‎src/rtlib/strw_trimex.c‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4,69 +4,69 @@
44

55
FBCALL FB_WCHAR *fb_WstrTrimEx ( const FB_WCHAR *src, const FB_WCHAR *pattern )
66
{
7-
FB_WCHAR *dst;
7+
FB_WCHAR *dst;
88
ssize_t len;
99
const FB_WCHAR *p = src;
1010

11-
if( src == NULL ) {
12-
return NULL;
13-
}
11+
if( src == NULL ) {
12+
return NULL;
13+
}
1414

15-
{
16-
ssize_t len_pattern = fb_wstr_Len( pattern );
17-
len = fb_wstr_Len( src );
18-
if( len >= len_pattern ) {
19-
if( len_pattern==1 ) {
20-
p = fb_wstr_SkipChar( src,
21-
len,
22-
*pattern );
23-
len -= fb_wstr_CalcDiff( src, p );
15+
{
16+
ssize_t len_pattern = fb_wstr_Len( pattern );
17+
len = fb_wstr_Len( src );
18+
if( len >= len_pattern ) {
19+
if( len_pattern==1 ) {
20+
p = fb_wstr_SkipChar( src,
21+
len,
22+
*pattern );
23+
len -= fb_wstr_CalcDiff( src, p );
2424

25-
} else if( len_pattern != 0 ) {
26-
p = src;
27-
while (len >= len_pattern ) {
28-
if( fb_wstr_Compare( p, pattern, len_pattern )!=0 )
29-
break;
30-
p += len_pattern;
31-
len -= len_pattern;
32-
}
33-
}
34-
}
35-
if( len >= len_pattern ) {
36-
if( len_pattern==1 ) {
37-
const FB_WCHAR *p_tmp =
38-
fb_wstr_SkipCharRev( p,
39-
len,
40-
*pattern );
41-
len = fb_wstr_CalcDiff( p, p_tmp );
25+
} else if( len_pattern != 0 ) {
26+
p = src;
27+
while (len >= len_pattern ) {
28+
if( fb_wstr_Compare( p, pattern, len_pattern )!=0 )
29+
break;
30+
p += len_pattern;
31+
len -= len_pattern;
32+
}
33+
}
34+
}
35+
if( len >= len_pattern ) {
36+
if( len_pattern==1 ) {
37+
const FB_WCHAR *p_tmp =
38+
fb_wstr_SkipCharRev( p,
39+
len,
40+
*pattern );
41+
len = fb_wstr_CalcDiff( p, p_tmp );
4242

43-
} else if( len_pattern != 0 ) {
44-
ssize_t test_index = len - len_pattern;
45-
while (len >= len_pattern ) {
46-
if( fb_wstr_Compare( p + test_index,
47-
pattern,
48-
len_pattern )!=0 )
49-
break;
50-
test_index -= len_pattern;
51-
}
52-
len = test_index + len_pattern;
43+
} else if( len_pattern != 0 ) {
44+
ssize_t test_index = len - len_pattern;
45+
while (len >= len_pattern ) {
46+
if( fb_wstr_Compare( p + test_index,
47+
pattern,
48+
len_pattern )!=0 )
49+
break;
50+
test_index -= len_pattern;
51+
}
52+
len = test_index + len_pattern;
5353

54-
}
55-
}
54+
}
55+
}
5656
}
5757

5858
if( len > 0 )
5959
{
6060
/* alloc temp string */
61-
dst = fb_wstr_AllocTemp( len );
61+
dst = fb_wstr_AllocTemp( len );
6262
if( dst != NULL )
6363
{
6464
/* simple copy */
6565
fb_wstr_Copy( dst, p, len );
6666
}
6767
else
6868
dst = NULL;
69-
}
69+
}
7070
else
7171
dst = NULL;
7272

0 commit comments

Comments
 (0)