Fixed main() prototypes in auto tests.
Future releases of GCC are planning to remove[0] default support for
some old features that were removed from C99 but GCC still accepts.
We can test for these changes by using the following -Werror=
directives
-Werror=implicit-int
-Werror=implicit-function-declaration
-Werror=int-conversion
-Werror=strict-prototypes
-Werror=old-style-definition
Doing so revealed an issue with the auto/ tests in that the test
programs always define main as
int main()
rather than
int main(void)
which results in a bunch of errors like
build/autotest.c:3:23: error: function declaration isn't a prototype [-Werror=strict-prototypes]
3 | int main() {
| ^~~~
build/autotest.c: In function 'main':
build/autotest.c:3:23: error: old-style function definition [-Werror=old-style-definition]
The fix was easy, it only required fixing the main prototype with
find -type f -exec sed -i 's/int main() {/int main(void) {/g' {} \;
Regardless of these upcoming GCC changes, this is probably a good thing
to do anyway for correctness.
[0]: https://fedoraproject.org/wiki/Changes/PortingToModernC
Link: <https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/CJXKTLXJUPZ4F2C2VQOTNMEA5JAUPMBD/>
Link: <https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/6SGHPHPAXKCVJ6PUZ57WVDQ5TDBVIRMF/>
Reviewed-by: Alejandro Colomar <alx@nginx.com>
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
This commit is contained in:
18
auto/ssltls
18
auto/ssltls
@@ -23,7 +23,7 @@ if [ $NXT_OPENSSL = YES ]; then
|
||||
nxt_feature_libs="-lssl -lcrypto"
|
||||
nxt_feature_test="#include <openssl/ssl.h>
|
||||
|
||||
int main() {
|
||||
int main(void) {
|
||||
SSL_library_init();
|
||||
return 0;
|
||||
}"
|
||||
@@ -39,7 +39,7 @@ if [ $NXT_OPENSSL = YES ]; then
|
||||
nxt_feature_run=value
|
||||
nxt_feature_test="#include <openssl/ssl.h>
|
||||
|
||||
int main() {
|
||||
int main(void) {
|
||||
printf(\"\\\"%s\\\"\",
|
||||
SSLeay_version(SSLEAY_VERSION));
|
||||
return 0;
|
||||
@@ -61,7 +61,7 @@ if [ $NXT_OPENSSL = YES ]; then
|
||||
nxt_feature_libs="$NXT_OPENSSL_LIBS"
|
||||
nxt_feature_test="#include <openssl/ssl.h>
|
||||
|
||||
int main() {
|
||||
int main(void) {
|
||||
SSL_CONF_cmd(NULL, NULL, NULL);
|
||||
return 0;
|
||||
}"
|
||||
@@ -75,7 +75,7 @@ if [ $NXT_OPENSSL = YES ]; then
|
||||
nxt_feature_libs="$NXT_OPENSSL_LIBS"
|
||||
nxt_feature_test="#include <openssl/ssl.h>
|
||||
|
||||
int main() {
|
||||
int main(void) {
|
||||
#if (OPENSSL_NO_TLSEXT)
|
||||
#error OpenSSL: no tlsext support.
|
||||
#else
|
||||
@@ -100,7 +100,7 @@ if [ $NXT_GNUTLS = YES ]; then
|
||||
nxt_feature_libs=$NXT_GNUTLS_LIBS
|
||||
nxt_feature_test="#include <gnutls/gnutls.h>
|
||||
|
||||
int main() {
|
||||
int main(void) {
|
||||
gnutls_global_init();
|
||||
gnutls_global_deinit();
|
||||
return 0;
|
||||
@@ -121,7 +121,7 @@ if [ $NXT_GNUTLS = YES ]; then
|
||||
nxt_feature_libs=$NXT_GNUTLS_LIBS
|
||||
nxt_feature_test="#include <gnutls/gnutls.h>
|
||||
|
||||
int main() {
|
||||
int main(void) {
|
||||
gnutls_transport_set_vec_push_function(NULL, NULL);
|
||||
return 0;
|
||||
}"
|
||||
@@ -135,7 +135,7 @@ if [ $NXT_GNUTLS = YES ]; then
|
||||
nxt_feature_libs=$NXT_GNUTLS_LIBS
|
||||
nxt_feature_test="#include <gnutls/gnutls.h>
|
||||
|
||||
int main() {
|
||||
int main(void) {
|
||||
gnutls_global_set_time_function(NULL);
|
||||
return 0;
|
||||
}"
|
||||
@@ -160,7 +160,7 @@ if [ $NXT_CYASSL = YES ]; then
|
||||
nxt_feature_libs="-lcyassl"
|
||||
nxt_feature_test="#include <cyassl/ssl.h>
|
||||
|
||||
int main() {
|
||||
int main(void) {
|
||||
CyaSSL_Init();
|
||||
CyaSSL_Cleanup();
|
||||
return 0;
|
||||
@@ -191,7 +191,7 @@ if [ $NXT_POLARSSL = YES ]; then
|
||||
nxt_feature_libs="-lpolarssl"
|
||||
nxt_feature_test="#include <polarssl/ssl.h>
|
||||
|
||||
int main() {
|
||||
int main(void) {
|
||||
ssl_context ssl;
|
||||
memset(&ssl, '\0', sizeof(ssl));
|
||||
ssl_init(&ssl);
|
||||
|
||||
Reference in New Issue
Block a user