ObjFW  Check-in [57ff42efa2]

Overview
Comment:Make GCC 4.0 happy again
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 57ff42efa21678f6b789b1b5a5c9a469e12090097a592142a601a97d65e79831
User & Date: js on 2021-12-05 17:30:14
Other Links: manifest | tags
Context
2021-12-05
17:39
Make Secure Transport work on macOS Leopard check-in: 50fd2e6e50 user: js tags: trunk
17:30
Make GCC 4.0 happy again check-in: 57ff42efa2 user: js tags: trunk
17:05
Update buildsys check-in: 5fcc7e6874 user: js tags: trunk
Changes

Modified src/OFURL.m from [73419ef6a6] to [6a00ae1e04].

592
593
594
595
596
597
598

599
600
601
602

603
604

605

606
607
608
609
610
611
612
			 * Some versions of GCC issue a false-positive warning
			 * (turned error) about a string overflow. This is a
			 * false positive because UTF8String is set to tmp
			 * above and tmp is either NULL or points *after* the
			 * slash for the path. So all we do here is go back to
			 * that slash and restore it.
			 */

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpragmas"
#pragma GCC diagnostic ignored "-Wunknown-warning-option"
#pragma GCC diagnostic ignored "-Wstringop-overflow"

			UTF8String--;
			*UTF8String = '/';

#pragma GCC diagnostic pop


			_URLEncodedPath = [[OFString alloc]
			    initWithUTF8String: UTF8String];

			OFURLVerifyIsEscaped(_URLEncodedPath,
			    [OFCharacterSet URLPathAllowedCharacterSet]);
		}







>
|
|
|
|
>


>
|
>







592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
			 * Some versions of GCC issue a false-positive warning
			 * (turned error) about a string overflow. This is a
			 * false positive because UTF8String is set to tmp
			 * above and tmp is either NULL or points *after* the
			 * slash for the path. So all we do here is go back to
			 * that slash and restore it.
			 */
#if OF_GCC_VERSION >= 402
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wpragmas"
# pragma GCC diagnostic ignored "-Wunknown-warning-option"
# pragma GCC diagnostic ignored "-Wstringop-overflow"
#endif
			UTF8String--;
			*UTF8String = '/';
#if OF_GCC_VERSION >= 402
# pragma GCC diagnostic pop
#endif

			_URLEncodedPath = [[OFString alloc]
			    initWithUTF8String: UTF8String];

			OFURLVerifyIsEscaped(_URLEncodedPath,
			    [OFCharacterSet URLPathAllowedCharacterSet]);
		}

Modified src/tls/OFSecureTransportTLSStream.m from [b0e8b99bd3] to [05236b5563].

70
71
72
73
74
75
76

77

78
79
80
81
82
83
84
}

/*
 * Apple deprecated Secure Transport without providing a replacement that can
 * work with any socket. On top of that, their replacement, Network.framework,
 * doesn't support STARTTLS at all.
 */

#pragma GCC diagnostic ignored "-Wdeprecated"


@implementation OFSecureTransportTLSStream
+ (void)load
{
	if (OFTLSStreamImplementation == Nil)
		OFTLSStreamImplementation = self;
}







>
|
>







70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
}

/*
 * Apple deprecated Secure Transport without providing a replacement that can
 * work with any socket. On top of that, their replacement, Network.framework,
 * doesn't support STARTTLS at all.
 */
#if OF_GCC_VERSION >= 402
# pragma GCC diagnostic ignored "-Wdeprecated"
#endif

@implementation OFSecureTransportTLSStream
+ (void)load
{
	if (OFTLSStreamImplementation == Nil)
		OFTLSStreamImplementation = self;
}