Skip to content

Commit 3d4ff6b

Browse files
vszakatsvszakats
committed
tidy-up: miscellaneous
- configure: fix indent, whitespace, drop empty comments. - .gitignore: drop `.DS_Store` (again) Keep this list for files created by libssh2. For other files, the per-machine global Git ignore file is a better place, and it fixes this for all repos, not just libssh2. Closes libssh2#1842
1 parent 5fe6421 commit 3d4ff6b

3 files changed

Lines changed: 117 additions & 114 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33
# SPDX-License-Identifier: BSD-3-Clause
44

5+
# for files created by the libssh2 build process
56
.deps
67
.libs
78
*-*-*
@@ -49,4 +50,3 @@ tags
4950
TAGS
5051
tap-driver.sh
5152
test-driver
52-
.DS_Store

‎acinclude.m4‎

Lines changed: 46 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ dnl result in a set of double-quoted strings the returned expansion will
5858
dnl actually be a single double-quoted string concatenating all them.
5959

6060
AC_DEFUN([CURL_CHECK_DEF], [
61-
AC_REQUIRE([CURL_CPP_P])dnl
61+
AC_REQUIRE([CURL_CPP_P])
6262
OLDCPPFLAGS=$CPPFLAGS
6363
# CPPPFLAG comes from CURL_CPP_P
6464
CPPFLAGS="$CPPFLAGS $CPPPFLAG"
65-
AS_VAR_PUSHDEF([ac_HaveDef], [curl_cv_have_def_$1])dnl
66-
AS_VAR_PUSHDEF([ac_Def], [curl_cv_def_$1])dnl
65+
AS_VAR_PUSHDEF([ac_HaveDef], [curl_cv_have_def_$1])
66+
AS_VAR_PUSHDEF([ac_Def], [curl_cv_def_$1])
6767
if test -z "$SED"; then
6868
AC_MSG_ERROR([SED not set. Cannot continue without SED being set.])
6969
fi
@@ -96,8 +96,8 @@ CURL_DEF_TOKEN $1
9696
AS_VAR_SET(ac_Def, $tmp_exp)
9797
ifelse($3,,[AC_MSG_RESULT([$tmp_exp])])
9898
fi
99-
AS_VAR_POPDEF([ac_Def])dnl
100-
AS_VAR_POPDEF([ac_HaveDef])dnl
99+
AS_VAR_POPDEF([ac_Def])
100+
AS_VAR_POPDEF([ac_HaveDef])
101101
CPPFLAGS=$OLDCPPFLAGS
102102
])
103103

@@ -106,7 +106,7 @@ dnl -------------------------------------------------
106106
dnl Verify if compiler being used is clang.
107107

108108
AC_DEFUN([CURL_CHECK_COMPILER_CLANG], [
109-
AC_BEFORE([$0],[CURL_CHECK_COMPILER_GNU_C])dnl
109+
AC_BEFORE([$0],[CURL_CHECK_COMPILER_GNU_C])
110110
AC_MSG_CHECKING([if compiler is clang])
111111
CURL_CHECK_DEF([__clang__], [], [silent])
112112
if test "$curl_cv_have_def___clang__" = "yes"; then
@@ -238,12 +238,12 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
238238
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [cast-align])
239239
tmp_CFLAGS="$tmp_CFLAGS -Wno-system-headers"
240240
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [shorten-64-to-32])
241-
#
241+
242242
dnl Only clang 1.1 or later
243243
if test "$compiler_num" -ge "101"; then
244244
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [unused])
245245
fi
246-
#
246+
247247
dnl Only clang 2.7 or later
248248
if test "$compiler_num" -ge "207"; then
249249
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [address])
@@ -263,28 +263,28 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
263263
fi
264264
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [unreachable-code unused-parameter])
265265
fi
266-
#
266+
267267
dnl Only clang 2.8 or later
268268
if test "$compiler_num" -ge "208"; then
269269
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [ignored-qualifiers])
270270
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [vla])
271271
fi
272-
#
272+
273273
dnl Only clang 2.9 or later
274274
if test "$compiler_num" -ge "209"; then
275275
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [sign-conversion])
276276
tmp_CFLAGS="$tmp_CFLAGS -Wno-error=sign-conversion" # FIXME
277277
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [shift-sign-overflow])
278278
# CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [padded]) # Not used because we cannot change public structs
279279
fi
280-
#
280+
281281
dnl Only clang 3.0 or later
282282
if test "$compiler_num" -ge "300"; then
283283
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [cast-qual])
284284
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [language-extension-token])
285285
tmp_CFLAGS="$tmp_CFLAGS -Wformat=2"
286286
fi
287-
#
287+
288288
dnl Only clang 3.2 or later
289289
if test "$compiler_num" -ge "302"; then
290290
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [enum-conversion])
@@ -299,24 +299,24 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
299299
;;
300300
esac
301301
fi
302-
#
302+
303303
dnl Only clang 3.4 or later
304304
if test "$compiler_num" -ge "304"; then
305305
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [header-guard])
306306
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [unused-const-variable])
307307
fi
308-
#
308+
309309
dnl Only clang 3.5 or later
310310
if test "$compiler_num" -ge "305"; then
311311
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [pragmas])
312312
# CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [unreachable-code-break]) # Not used: Silent in "unity" builds
313313
fi
314-
#
314+
315315
dnl Only clang 3.6 or later
316316
if test "$compiler_num" -ge "306"; then
317317
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [double-promotion])
318318
fi
319-
#
319+
320320
dnl Only clang 3.9 or later
321321
if test "$compiler_num" -ge "309"; then
322322
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [comma])
@@ -393,20 +393,20 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
393393
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [all])
394394
tmp_CFLAGS="$tmp_CFLAGS -W"
395395
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [pointer-arith write-strings])
396-
#
396+
397397
dnl Only gcc 2.7 or later
398398
if test "$compiler_num" -ge "207"; then
399399
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [inline nested-externs])
400400
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [missing-declarations])
401401
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [missing-prototypes])
402402
fi
403-
#
403+
404404
dnl Only gcc 2.95 or later
405405
if test "$compiler_num" -ge "295"; then
406406
tmp_CFLAGS="$tmp_CFLAGS -Wno-long-long"
407407
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [bad-function-cast])
408408
fi
409-
#
409+
410410
dnl Only gcc 2.96 or later
411411
if test "$compiler_num" -ge "296"; then
412412
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [float-equal])
@@ -417,7 +417,7 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
417417
dnl headers with gcc 2.95.4 on FreeBSD 4.9
418418
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [undef])
419419
fi
420-
#
420+
421421
dnl Only gcc 3.0 or later
422422
if test "$compiler_num" -ge "300"; then
423423
tmp_CFLAGS="$tmp_CFLAGS -Wno-system-headers"
@@ -427,24 +427,24 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
427427
dnl over making it unusable for generic purposes. Let's not use it.
428428
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [unused shadow])
429429
fi
430-
#
430+
431431
dnl Only gcc 3.3 or later
432432
if test "$compiler_num" -ge "303"; then
433433
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [endif-labels strict-prototypes])
434434
fi
435-
#
435+
436436
dnl Only gcc 3.4 or later
437437
if test "$compiler_num" -ge "304"; then
438438
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [declaration-after-statement])
439439
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [old-style-definition])
440440
fi
441-
#
441+
442442
dnl Only gcc 4.0 or later
443443
if test "$compiler_num" -ge "400"; then
444444
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [cast-qual])
445445
tmp_CFLAGS="$tmp_CFLAGS -Wstrict-aliasing=3"
446446
fi
447-
#
447+
448448
dnl Only gcc 4.1 or later (possibly earlier)
449449
if test "$compiler_num" -ge "401"; then
450450
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [attributes])
@@ -458,12 +458,12 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
458458
# CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [switch-enum]) # Not used because this basically disallows default case
459459
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [unused-macros])
460460
fi
461-
#
461+
462462
dnl Only gcc 4.2 or later
463463
if test "$compiler_num" -ge "402"; then
464464
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [cast-align])
465465
fi
466-
#
466+
467467
dnl Only gcc 4.3 or later
468468
if test "$compiler_num" -ge "403"; then
469469
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [address])
@@ -477,7 +477,7 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
477477
dnl required for -Warray-bounds, included in -Wall
478478
tmp_CFLAGS="$tmp_CFLAGS -ftree-vrp"
479479
fi
480-
#
480+
481481
dnl Only gcc 4.5 or later
482482
if test "$compiler_num" -ge "405"; then
483483
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [jump-misses-init])
@@ -488,23 +488,23 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
488488
;;
489489
esac
490490
fi
491-
#
491+
492492
dnl Only gcc 4.6 or later
493493
if test "$compiler_num" -ge "406"; then
494494
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [double-promotion])
495495
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [trampolines])
496496
fi
497-
#
497+
498498
dnl only gcc 4.8 or later
499499
if test "$compiler_num" -ge "408"; then
500500
tmp_CFLAGS="$tmp_CFLAGS -Wformat=2"
501501
fi
502-
#
502+
503503
dnl Only gcc 5 or later
504504
if test "$compiler_num" -ge "500"; then
505505
tmp_CFLAGS="$tmp_CFLAGS -Warray-bounds=2"
506506
fi
507-
#
507+
508508
dnl Only gcc 6 or later
509509
if test "$compiler_num" -ge "600"; then
510510
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [shift-negative-value])
@@ -514,7 +514,7 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
514514
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [duplicated-cond])
515515
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [unused-const-variable])
516516
fi
517-
#
517+
518518
dnl Only gcc 7 or later
519519
if test "$compiler_num" -ge "700"; then
520520
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [duplicated-branches])
@@ -524,24 +524,23 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
524524
tmp_CFLAGS="$tmp_CFLAGS -Wformat-truncation=2"
525525
tmp_CFLAGS="$tmp_CFLAGS -Wimplicit-fallthrough"
526526
fi
527-
#
527+
528528
dnl Only gcc 10 or later
529529
if test "$compiler_num" -ge "1000"; then
530530
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [arith-conversion])
531531
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [enum-conversion])
532532
fi
533-
#
533+
534534
dnl Only gcc 12 or later
535535
if test "$compiler_num" -ge "1200"; then
536536
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [array-compare])
537537
fi
538-
#
538+
539539
dnl Only gcc 13 or later
540540
if test "$compiler_num" -ge "1300"; then
541541
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [enum-int-mismatch])
542542
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [xor-used-as-pow])
543543
fi
544-
#
545544
546545
for flag in $CPPFLAGS; do
547546
case "$flag" in
@@ -591,7 +590,7 @@ dnl Add each compiler warning from NEW-WARNINGS that has not
591590
dnl been disabled via CFLAGS to WARNING-LIST.
592591

593592
AC_DEFUN([CURL_ADD_COMPILER_WARNINGS], [
594-
AC_REQUIRE([CURL_SHFUNC_SQUEEZE])dnl
593+
AC_REQUIRE([CURL_SHFUNC_SQUEEZE])
595594
ac_var_added_warnings=""
596595
for warning in [$2]; do
597596
CURL_VAR_MATCH(CFLAGS, [-Wno-$warning -W$warning])
@@ -801,17 +800,17 @@ dnl that it is defined equally for further configure
801800
dnl tests and generated config file.
802801

803802
AC_DEFUN([CURL_CONFIGURE_REENTRANT], [
804-
AC_PREREQ([2.50])dnl
805-
#
803+
AC_PREREQ([2.50])
804+
806805
AC_MSG_CHECKING([if _REENTRANT is already defined])
807806
AC_COMPILE_IFELSE([
808807
AC_LANG_PROGRAM([[
809808
]],[[
810-
#ifdef _REENTRANT
811-
int dummy=1;
812-
#else
813-
force compilation error
814-
#endif
809+
#ifdef _REENTRANT
810+
int dummy=1;
811+
#else
812+
force compilation error
813+
#endif
815814
]])
816815
],[
817816
AC_MSG_RESULT([yes])
@@ -820,7 +819,7 @@ AC_DEFUN([CURL_CONFIGURE_REENTRANT], [
820819
AC_MSG_RESULT([no])
821820
tmp_reentrant_initially_defined="no"
822821
])
823-
#
822+
824823
if test "$tmp_reentrant_initially_defined" = "no"; then
825824
AC_MSG_CHECKING([if _REENTRANT is actually needed])
826825
CURL_CHECK_NEED_REENTRANT_SYSTEM
@@ -831,7 +830,7 @@ AC_DEFUN([CURL_CONFIGURE_REENTRANT], [
831830
AC_MSG_RESULT([no])
832831
fi
833832
fi
834-
#
833+
835834
AC_MSG_CHECKING([if _REENTRANT is onwards defined])
836835
if test "$tmp_reentrant_initially_defined" = "yes" ||
837836
test "$tmp_need_reentrant" = "yes"; then
@@ -840,7 +839,6 @@ AC_DEFUN([CURL_CONFIGURE_REENTRANT], [
840839
else
841840
AC_MSG_RESULT([no])
842841
fi
843-
#
844842
])
845843

846844
dnl LIBSSH2_LIB_HAVE_LINKFLAGS
@@ -938,7 +936,7 @@ dnl --enable-werror or --disable-werror, and set
938936
dnl shell variable want_werror as appropriate.
939937

940938
AC_DEFUN([LIBSSH2_CHECK_OPTION_WERROR], [
941-
AC_BEFORE([$0],[LIBSSH2_CHECK_COMPILER])dnl
939+
AC_BEFORE([$0],[LIBSSH2_CHECK_COMPILER])
942940
AC_MSG_CHECKING([whether to enable compiler warnings as errors])
943941
OPT_COMPILER_WERROR="default"
944942
AC_ARG_ENABLE(werror,

0 commit comments

Comments
 (0)