Skip to content

Commit 48b1966

Browse files
jayrmjayrm
committed
rtlib: quiet warnings in newer gcc
1 parent c1c87bc commit 48b1966

File tree

9 files changed

+92
-84
lines changed

9 files changed

+92
-84
lines changed

‎src/rtlib/dev_scrn_read_wstr.c‎

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,71 +4,73 @@
44

55
int fb_DevScrnReadWstr( FB_FILE *handle, FB_WCHAR *dst, size_t *pchars )
66
{
7-
size_t chars, copy_chars;
8-
DEV_SCRN_INFO *info;
7+
size_t chars, copy_chars;
8+
DEV_SCRN_INFO *info;
99

10-
/* !!!FIXME!!! no unicode input supported */
10+
/* !!!FIXME!!! no unicode input supported */
1111

12-
FB_LOCK();
12+
FB_LOCK();
1313

14-
chars = *pchars;
14+
chars = *pchars;
1515

16-
info = (DEV_SCRN_INFO*) FB_HANDLE_DEREF(handle)->opaque;
16+
info = (DEV_SCRN_INFO*) FB_HANDLE_DEREF(handle)->opaque;
1717

18-
while( chars > 0 )
19-
{
20-
size_t len = info->length / sizeof( FB_WCHAR );
21-
copy_chars = (chars > len) ? len : chars;
22-
if( copy_chars == 0 )
23-
{
24-
while( fb_KeyHit( ) == 0 )
25-
fb_Delay( 25 ); /* release time slice */
18+
while( chars > 0 )
19+
{
20+
size_t len = info->length / sizeof( FB_WCHAR );
21+
copy_chars = (chars > len) ? len : chars;
22+
if( copy_chars == 0 )
23+
{
24+
while( fb_KeyHit( ) == 0 )
25+
fb_Delay( 25 ); /* release time slice */
2626

27-
fb_DevScrnFillInput( info );
28-
if( info->length != 0 )
29-
continue;
27+
fb_DevScrnFillInput( info );
28+
if( info->length != 0 )
29+
continue;
3030

31-
break;
32-
}
31+
break;
32+
}
3333

34-
fb_wstr_ConvFromA( dst, chars, info->buffer );
34+
fb_wstr_ConvFromA( dst, chars, info->buffer );
3535

36-
info->length -= copy_chars * sizeof( FB_WCHAR );
37-
if( info->length != 0 )
38-
{
39-
memmove( info->buffer,
40-
info->buffer + copy_chars * sizeof( FB_WCHAR ),
41-
info->length );
42-
}
36+
info->length -= copy_chars * sizeof( FB_WCHAR );
37+
if( info->length != 0 )
38+
{
39+
memmove( info->buffer,
40+
info->buffer + copy_chars * sizeof( FB_WCHAR ),
41+
info->length );
42+
}
4343

44-
chars -= copy_chars;
45-
dst += copy_chars;
46-
}
44+
chars -= copy_chars;
45+
dst += copy_chars;
46+
}
4747

48-
FB_UNLOCK();
48+
FB_UNLOCK();
4949

50-
if( chars != 0 )
51-
memset( dst, 0, chars * sizeof( FB_WCHAR ) );
50+
if( chars != 0 )
51+
{
52+
memset( dst, 0, chars * sizeof( FB_WCHAR ) );
53+
}
5254

53-
*pchars -= chars;
55+
*pchars -= chars;
5456

5557
return fb_ErrorSetNum( FB_RTERROR_OK );
5658
}
5759

5860
static int hReadFromStdin( FB_FILE *handle, FB_WCHAR *dst, size_t *pchars )
5961
{
60-
return fb_DevFileReadWstr( NULL, dst, pchars );
62+
return fb_DevFileReadWstr( NULL, dst, pchars );
6163
}
6264

6365
void fb_DevScrnInit_ReadWstr( void )
6466
{
6567
fb_DevScrnInit_NoOpen( );
6668

6769
FB_LOCK( );
68-
if( FB_HANDLE_SCREEN->hooks->pfnReadWstr == NULL )
69-
{
70-
FB_HANDLE_SCREEN->hooks->pfnReadWstr =
71-
(fb_IsRedirected( TRUE )? hReadFromStdin : fb_DevScrnReadWstr);
72-
}
70+
if( FB_HANDLE_SCREEN->hooks->pfnReadWstr == NULL )
71+
{
72+
FB_HANDLE_SCREEN->hooks->pfnReadWstr =
73+
(fb_IsRedirected( TRUE )? hReadFromStdin : fb_DevScrnReadWstr);
74+
}
7375
FB_UNLOCK( );
7476
}

‎src/rtlib/dev_scrn_readline.c‎

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

55
int fb_DevScrnReadLine( FB_FILE *handle, FBSTRING *dst )
66
{
7-
return fb_LineInput( NULL, dst, -1, FALSE, FALSE, TRUE );
7+
return fb_LineInput( NULL, dst, -1, FALSE, FALSE, TRUE );
88
}
99

1010
void fb_DevScrnInit_ReadLine( void )
1111
{
1212
fb_DevScrnInit_NoOpen( );
1313

1414
FB_LOCK( );
15-
if( FB_HANDLE_SCREEN->hooks->pfnReadLine == NULL )
16-
FB_HANDLE_SCREEN->hooks->pfnReadLine = fb_DevScrnReadLine;
15+
if( FB_HANDLE_SCREEN->hooks->pfnReadLine == NULL ) {
16+
FB_HANDLE_SCREEN->hooks->pfnReadLine = fb_DevScrnReadLine;
17+
}
1718
FB_UNLOCK( );
1819
}

‎src/rtlib/dev_scrn_readline_wstr.c‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,29 @@
44

55
int fb_DevScrnReadLineWstr( FB_FILE *handle, FB_WCHAR *dst, ssize_t dst_chars )
66
{
7-
int res;
8-
FBSTRING temp = { 0, 0, 0 };
7+
int res;
8+
FBSTRING temp = { 0, 0, 0 };
99

10-
/* !!!FIXME!!! no unicode input supported */
10+
/* !!!FIXME!!! no unicode input supported */
1111

12-
res = fb_LineInput( NULL, (void *)&temp, -1, FALSE, FALSE, TRUE );
12+
res = fb_LineInput( NULL, (void *)&temp, -1, FALSE, FALSE, TRUE );
1313

14-
if( res == FB_RTERROR_OK )
15-
fb_WstrAssignFromA( dst, dst_chars, (void *)&temp, -1 );
14+
if( res == FB_RTERROR_OK ) {
15+
fb_WstrAssignFromA( dst, dst_chars, (void *)&temp, -1 );
16+
}
1617

17-
fb_StrDelete( &temp );
18+
fb_StrDelete( &temp );
1819

19-
return res;
20+
return res;
2021
}
2122

2223
void fb_DevScrnInit_ReadLineWstr( void )
2324
{
2425
fb_DevScrnInit_NoOpen( );
2526

2627
FB_LOCK( );
27-
if( FB_HANDLE_SCREEN->hooks->pfnReadLineWstr == NULL )
28-
FB_HANDLE_SCREEN->hooks->pfnReadLineWstr = fb_DevScrnReadLineWstr;
28+
if( FB_HANDLE_SCREEN->hooks->pfnReadLineWstr == NULL ) {
29+
FB_HANDLE_SCREEN->hooks->pfnReadLineWstr = fb_DevScrnReadLineWstr;
30+
}
2931
FB_UNLOCK( );
3032
}

‎src/rtlib/dev_scrn_write.c‎

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

55
int fb_DevScrnWrite( FB_FILE *handle, const void* value, size_t valuelen )
66
{
7-
fb_PrintBufferEx( value, valuelen, 0 );
7+
fb_PrintBufferEx( value, valuelen, 0 );
88
return fb_ErrorSetNum( FB_RTERROR_OK );
99
}
1010

@@ -13,7 +13,8 @@ void fb_DevScrnInit_Write( void )
1313
fb_DevScrnInit_NoOpen( );
1414

1515
FB_LOCK( );
16-
if( FB_HANDLE_SCREEN->hooks->pfnWrite == NULL )
17-
FB_HANDLE_SCREEN->hooks->pfnWrite = fb_DevScrnWrite;
16+
if( FB_HANDLE_SCREEN->hooks->pfnWrite == NULL ) {
17+
FB_HANDLE_SCREEN->hooks->pfnWrite = fb_DevScrnWrite;
18+
}
1819
FB_UNLOCK( );
1920
}

‎src/rtlib/dev_scrn_write_wstr.c‎

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

55
int fb_DevScrnWriteWstr( FB_FILE *handle, const FB_WCHAR* value, size_t valuelen )
66
{
7-
fb_PrintBufferWstrEx( value, valuelen, 0 );
7+
fb_PrintBufferWstrEx( value, valuelen, 0 );
88
return fb_ErrorSetNum( FB_RTERROR_OK );
99
}
1010

@@ -13,7 +13,8 @@ void fb_DevScrnInit_WriteWstr( void )
1313
fb_DevScrnInit_NoOpen( );
1414

1515
FB_LOCK( );
16-
if( FB_HANDLE_SCREEN->hooks->pfnWriteWstr == NULL )
17-
FB_HANDLE_SCREEN->hooks->pfnWriteWstr = fb_DevScrnWriteWstr;
16+
if( FB_HANDLE_SCREEN->hooks->pfnWriteWstr == NULL ) {
17+
FB_HANDLE_SCREEN->hooks->pfnWriteWstr = fb_DevScrnWriteWstr;
18+
}
1819
FB_UNLOCK( );
1920
}

‎src/rtlib/dev_stdio_close.c‎

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

55
int fb_DevStdIoClose( FB_FILE *handle )
66
{
7-
FB_LOCK();
7+
FB_LOCK();
88

99
handle->opaque = NULL;
1010

11-
FB_UNLOCK();
11+
FB_UNLOCK();
1212

1313
return fb_ErrorSetNum( FB_RTERROR_OK );
1414
}

‎src/rtlib/hook_print_wstr.c‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ FBCALL void fb_PrintBufferWstrEx( const FB_WCHAR *buffer, size_t len, int mask )
77
{
88
FB_LOCK();
99

10-
if( __fb_ctx.hooks.printbuffwproc )
11-
__fb_ctx.hooks.printbuffwproc( buffer, len, mask );
12-
else
13-
fb_ConsolePrintBufferWstrEx( buffer, len, mask );
10+
if( __fb_ctx.hooks.printbuffwproc ) {
11+
__fb_ctx.hooks.printbuffwproc( buffer, len, mask );
12+
} else {
13+
fb_ConsolePrintBufferWstrEx( buffer, len, mask );
14+
}
1415

1516
FB_UNLOCK();
1617

@@ -19,7 +20,5 @@ FBCALL void fb_PrintBufferWstrEx( const FB_WCHAR *buffer, size_t len, int mask )
1920
/*:::::*/
2021
FBCALL void fb_PrintBufferWstr( const FB_WCHAR *buffer, int mask )
2122
{
22-
23-
return fb_PrintBufferWstrEx( buffer, fb_wstr_Len( buffer ), mask );
24-
23+
return fb_PrintBufferWstrEx( buffer, fb_wstr_Len( buffer ), mask );
2524
}

‎src/rtlib/hook_printstr.c‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ FBCALL void fb_PrintBufferEx( const void *buffer, size_t len, int mask )
77
{
88
FB_LOCK();
99

10-
if( __fb_ctx.hooks.printbuffproc )
11-
__fb_ctx.hooks.printbuffproc( buffer, len, mask );
12-
else
13-
fb_ConsolePrintBufferEx( buffer, len, mask );
10+
if( __fb_ctx.hooks.printbuffproc ) {
11+
__fb_ctx.hooks.printbuffproc( buffer, len, mask );
12+
} else {
13+
fb_ConsolePrintBufferEx( buffer, len, mask );
14+
}
1415

1516
FB_UNLOCK();
1617

@@ -19,7 +20,5 @@ FBCALL void fb_PrintBufferEx( const void *buffer, size_t len, int mask )
1920
/*:::::*/
2021
FBCALL void fb_PrintBuffer( const char *buffer, int mask )
2122
{
22-
23-
return fb_PrintBufferEx( buffer, strlen( buffer ), mask );
24-
23+
return fb_PrintBufferEx( buffer, strlen( buffer ), mask );
2524
}

‎src/rtlib/hook_width.c‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,22 @@ FBCALL int fb_Width( int cols, int rows )
1111

1212
FB_LOCK();
1313

14-
if( __fb_ctx.hooks.widthproc )
14+
if( __fb_ctx.hooks.widthproc ) {
1515
cur = __fb_ctx.hooks.widthproc( cols, rows );
16-
else
17-
cur = fb_ConsoleWidth( cols, rows );
16+
} else {
17+
cur = fb_ConsoleWidth( cols, rows );
18+
}
1819

19-
if( cols>0 )
20-
FB_HANDLE_SCREEN->width = cols;
20+
if( cols>0 ) {
21+
FB_HANDLE_SCREEN->width = cols;
22+
}
2123

22-
/* Reset VIEW PRINT */
23-
if( (cols > 0) || (rows > 0) )
24-
fb_ConsoleView( 0, 0 );
24+
/* Reset VIEW PRINT */
25+
if( (cols > 0) || (rows > 0) ) {
26+
fb_ConsoleView( 0, 0 );
27+
}
2528

2629
FB_UNLOCK();
2730

28-
return ((cols<1 && rows<1) ? cur : 0);
31+
return ((cols<1 && rows<1) ? cur : 0);
2932
}

0 commit comments

Comments
 (0)