Skip to content

Commit 432f995

Browse files
sjaeckelsjaeckel
authored
Merge pull request #205 from libtom/travis_check_sources
Add travis build-job that checks the source-code format
2 parents 9e8b71e + c4bb3c1 commit 432f995

File tree

12 files changed

+49
-64
lines changed

12 files changed

+49
-64
lines changed

‎.travis.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
# #
66
#############################################################################
77

8+
# Run the tests based on Ubuntu 16.04
9+
dist: xenial
10+
811
# Compilation failures are in gcc_errors_*.log
912
# Failed tests in test_*.log
1013
# Files do not exist in case of success
@@ -57,6 +60,14 @@ matrix:
5760
# We have only one program and the variable $BUILDOPTIONS
5861
# has only the options to that program: testme.sh
5962

63+
# Check source code format
64+
- env: BUILDOPTIONS='--format'
65+
addons:
66+
apt:
67+
packages:
68+
- astyle
69+
sudo: required
70+
6071
# GCC for the 32-bit architecture (no valgrind yet)
6172
- env: BUILDOPTIONS='--with-cc=gcc --with-m32'
6273
addons:

‎bn_mp_clear.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void mp_clear(mp_int *a)
2525
}
2626

2727
/* free ram */
28-
XFREE(a->dp, sizeof (mp_digit) * (size_t)a->alloc);
28+
XFREE(a->dp, sizeof(mp_digit) * (size_t)a->alloc);
2929

3030
/* reset members to make debugging easier */
3131
a->dp = NULL;

‎bn_mp_decr.c‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@ int mp_decr(mp_int *a)
4040
}
4141
return mp_sub_d(a, 1uL,a);
4242
}
43-
44-
4543
#endif
46-
/* ref: \$Format:\%D$ */
47-
/* git commit: \$Format:\%H$ */
48-
/* commit time: \$Format:\%ai$ */
44+
45+
/* ref: $Format:%D$ */
46+
/* git commit: $Format:%H$ */
47+
/* commit time: $Format:%ai$ */

‎bn_mp_grow.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ int mp_grow(mp_int *a, int size)
3030
* to overwrite the dp member of a.
3131
*/
3232
tmp = (mp_digit *) XREALLOC(a->dp,
33-
(size_t)a->alloc * sizeof (mp_digit),
33+
(size_t)a->alloc * sizeof(mp_digit),
3434
(size_t)size * sizeof(mp_digit));
3535
if (tmp == NULL) {
3636
/* reallocation failed but "a" is still valid [can be freed] */

‎bn_mp_incr.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ int mp_incr(mp_int *a)
3535
}
3636
return mp_add_d(a, 1uL,a);
3737
}
38-
3938
#endif
40-
/* ref: \$Format:\%D$ */
41-
/* git commit: \$Format:\%H$ */
42-
/* commit time: \$Format:\%ai$ */
39+
40+
/* ref: $Format:%D$ */
41+
/* git commit: $Format:%H$ */
42+
/* commit time: $Format:%ai$ */

‎bn_mp_iseven.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
* Michael Fromberger but has been written from scratch with
1010
* additional optimizations in place.
1111
*
12-
* The library is free for all purposes without any express
13-
* guarantee it works.
12+
* SPDX-License-Identifier: Unlicense
1413
*/
1514

1615
int mp_iseven(const mp_int *a)

‎bn_mp_isodd.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
* Michael Fromberger but has been written from scratch with
1010
* additional optimizations in place.
1111
*
12-
* The library is free for all purposes without any express
13-
* guarantee it works.
12+
* SPDX-License-Identifier: Unlicense
1413
*/
1514

1615
int mp_isodd(const mp_int *a)

‎bn_mp_shrink.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ int mp_shrink(mp_int *a)
2424

2525
if (a->alloc != used) {
2626
if ((tmp = (mp_digit *) XREALLOC(a->dp,
27-
(size_t)a->alloc * sizeof (mp_digit),
27+
(size_t)a->alloc * sizeof(mp_digit),
2828
(size_t)used * sizeof(mp_digit))) == NULL) {
2929
return MP_MEM;
3030
}

‎callgraph.txt‎

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2416,8 +2416,6 @@ BN_MP_INIT_SET_INT_C
24162416
+--->BN_MP_INIT_C
24172417
+--->BN_MP_SET_INT_C
24182418
| +--->BN_MP_SET_LONG_C
2419-
| | +--->BN_MP_GROW_C
2420-
| | +--->BN_MP_ZERO_C
24212419

24222420

24232421
BN_MP_INIT_SIZE_C
@@ -2743,8 +2741,6 @@ BN_MP_IS_SQUARE_C
27432741
| +--->BN_MP_INIT_C
27442742
| +--->BN_MP_SET_INT_C
27452743
| | +--->BN_MP_SET_LONG_C
2746-
| | | +--->BN_MP_GROW_C
2747-
| | | +--->BN_MP_ZERO_C
27482744
+--->BN_MP_MOD_C
27492745
| +--->BN_MP_INIT_SIZE_C
27502746
| | +--->BN_MP_INIT_C
@@ -5659,8 +5655,6 @@ BN_MP_PRIME_FROBENIUS_UNDERWOOD_C
56595655
| | | +--->BN_MP_INIT_C
56605656
| | | +--->BN_MP_SET_INT_C
56615657
| | | | +--->BN_MP_SET_LONG_C
5662-
| | | | | +--->BN_MP_GROW_C
5663-
| | | | | +--->BN_MP_ZERO_C
56645658
| | +--->BN_MP_MOD_C
56655659
| | | +--->BN_MP_INIT_SIZE_C
56665660
| | | | +--->BN_MP_INIT_C
@@ -7264,8 +7258,6 @@ BN_MP_PRIME_FROBENIUS_UNDERWOOD_C
72647258
| | | +--->BN_MP_CLAMP_C
72657259
| | +--->BN_MP_INIT_C
72667260
| | +--->BN_MP_SET_LONG_C
7267-
| | | +--->BN_MP_GROW_C
7268-
| | | +--->BN_MP_ZERO_C
72697261
| | +--->BN_MP_MUL_C
72707262
| | | +--->BN_MP_TOOM_MUL_C
72717263
| | | | +--->BN_MP_INIT_MULTI_C
@@ -7616,8 +7608,6 @@ BN_MP_PRIME_FROBENIUS_UNDERWOOD_C
76167608
| +--->BN_MP_INIT_C
76177609
| +--->BN_MP_CLEAR_C
76187610
+--->BN_MP_SET_LONG_C
7619-
| +--->BN_MP_GROW_C
7620-
| +--->BN_MP_ZERO_C
76217611
+--->BN_MP_SQR_C
76227612
| +--->BN_MP_TOOM_SQR_C
76237613
| | +--->BN_MP_MOD_2D_C
@@ -7975,8 +7965,6 @@ BN_MP_PRIME_IS_PRIME_C
79757965
| | +--->BN_MP_INIT_C
79767966
| | +--->BN_MP_SET_INT_C
79777967
| | | +--->BN_MP_SET_LONG_C
7978-
| | | | +--->BN_MP_GROW_C
7979-
| | | | +--->BN_MP_ZERO_C
79807968
| +--->BN_MP_MOD_C
79817969
| | +--->BN_MP_INIT_SIZE_C
79827970
| | | +--->BN_MP_INIT_C
@@ -9579,8 +9567,6 @@ BN_MP_PRIME_IS_PRIME_C
95799567
| | +--->BN_MP_INIT_C
95809568
| | +--->BN_MP_CLEAR_C
95819569
| +--->BN_MP_SET_LONG_C
9582-
| | +--->BN_MP_GROW_C
9583-
| | +--->BN_MP_ZERO_C
95849570
| +--->BN_MP_SQR_C
95859571
| | +--->BN_MP_TOOM_SQR_C
95869572
| | | +--->BN_MP_MOD_2D_C
@@ -9890,8 +9876,6 @@ BN_MP_PRIME_IS_PRIME_C
98909876
| | +--->BN_MP_CLAMP_C
98919877
| +--->BN_MP_INIT_C
98929878
| +--->BN_MP_SET_LONG_C
9893-
| | +--->BN_MP_GROW_C
9894-
| | +--->BN_MP_ZERO_C
98959879
| +--->BN_MP_MUL_C
98969880
| | +--->BN_MP_TOOM_MUL_C
98979881
| | | +--->BN_MP_INIT_MULTI_C
@@ -11371,8 +11355,6 @@ BN_MP_PRIME_NEXT_PRIME_C
1137111355
| | +--->BN_MP_INIT_SET_INT_C
1137211356
| | | +--->BN_MP_SET_INT_C
1137311357
| | | | +--->BN_MP_SET_LONG_C
11374-
| | | | | +--->BN_MP_GROW_C
11375-
| | | | | +--->BN_MP_ZERO_C
1137611358
| | +--->BN_MP_MOD_C
1137711359
| | | +--->BN_MP_INIT_SIZE_C
1137811360
| | | +--->BN_MP_DIV_C
@@ -12909,8 +12891,6 @@ BN_MP_PRIME_NEXT_PRIME_C
1290912891
| | +--->BN_MP_INIT_MULTI_C
1291012892
| | | +--->BN_MP_CLEAR_C
1291112893
| | +--->BN_MP_SET_LONG_C
12912-
| | | +--->BN_MP_GROW_C
12913-
| | | +--->BN_MP_ZERO_C
1291412894
| | +--->BN_MP_SQR_C
1291512895
| | | +--->BN_MP_TOOM_SQR_C
1291612896
| | | | +--->BN_MP_MOD_2D_C
@@ -13200,8 +13180,6 @@ BN_MP_PRIME_NEXT_PRIME_C
1320013180
| | | +--->BN_MP_GROW_C
1320113181
| | | +--->BN_MP_CLAMP_C
1320213182
| | +--->BN_MP_SET_LONG_C
13203-
| | | +--->BN_MP_GROW_C
13204-
| | | +--->BN_MP_ZERO_C
1320513183
| | +--->BN_MP_MUL_C
1320613184
| | | +--->BN_MP_TOOM_MUL_C
1320713185
| | | | +--->BN_MP_INIT_MULTI_C
@@ -13568,8 +13546,6 @@ BN_MP_PRIME_RANDOM_EX_C
1356813546
| | | +--->BN_MP_INIT_C
1356913547
| | | +--->BN_MP_SET_INT_C
1357013548
| | | | +--->BN_MP_SET_LONG_C
13571-
| | | | | +--->BN_MP_GROW_C
13572-
| | | | | +--->BN_MP_ZERO_C
1357313549
| | +--->BN_MP_MOD_C
1357413550
| | | +--->BN_MP_INIT_SIZE_C
1357513551
| | | | +--->BN_MP_INIT_C
@@ -15172,8 +15148,6 @@ BN_MP_PRIME_RANDOM_EX_C
1517215148
| | | +--->BN_MP_INIT_C
1517315149
| | | +--->BN_MP_CLEAR_C
1517415150
| | +--->BN_MP_SET_LONG_C
15175-
| | | +--->BN_MP_GROW_C
15176-
| | | +--->BN_MP_ZERO_C
1517715151
| | +--->BN_MP_SQR_C
1517815152
| | | +--->BN_MP_TOOM_SQR_C
1517915153
| | | | +--->BN_MP_MOD_2D_C
@@ -15483,8 +15457,6 @@ BN_MP_PRIME_RANDOM_EX_C
1548315457
| | | +--->BN_MP_CLAMP_C
1548415458
| | +--->BN_MP_INIT_C
1548515459
| | +--->BN_MP_SET_LONG_C
15486-
| | | +--->BN_MP_GROW_C
15487-
| | | +--->BN_MP_ZERO_C
1548815460
| | +--->BN_MP_MUL_C
1548915461
| | | +--->BN_MP_TOOM_MUL_C
1549015462
| | | | +--->BN_MP_INIT_MULTI_C
@@ -15874,8 +15846,6 @@ BN_MP_PRIME_STRONG_LUCAS_SELFRIDGE_C
1587415846
| | | +--->BN_MP_INIT_C
1587515847
| | | +--->BN_MP_SET_INT_C
1587615848
| | | | +--->BN_MP_SET_LONG_C
15877-
| | | | | +--->BN_MP_GROW_C
15878-
| | | | | +--->BN_MP_ZERO_C
1587915849
| | +--->BN_MP_MOD_C
1588015850
| | | +--->BN_MP_INIT_SIZE_C
1588115851
| | | | +--->BN_MP_INIT_C
@@ -17478,8 +17448,6 @@ BN_MP_PRIME_STRONG_LUCAS_SELFRIDGE_C
1747817448
| | | +--->BN_MP_INIT_C
1747917449
| | | +--->BN_MP_CLEAR_C
1748017450
| | +--->BN_MP_SET_LONG_C
17481-
| | | +--->BN_MP_GROW_C
17482-
| | | +--->BN_MP_ZERO_C
1748317451
| | +--->BN_MP_SQR_C
1748417452
| | | +--->BN_MP_TOOM_SQR_C
1748517453
| | | | +--->BN_MP_MOD_2D_C
@@ -17822,8 +17790,6 @@ BN_MP_PRIME_STRONG_LUCAS_SELFRIDGE_C
1782217790
| +--->BN_MP_CLAMP_C
1782317791
+--->BN_MP_INIT_C
1782417792
+--->BN_MP_SET_LONG_C
17825-
| +--->BN_MP_GROW_C
17826-
| +--->BN_MP_ZERO_C
1782717793
+--->BN_MP_MUL_C
1782817794
| +--->BN_MP_TOOM_MUL_C
1782917795
| | +--->BN_MP_INIT_MULTI_C
@@ -18666,13 +18632,9 @@ BN_MP_SET_DOUBLE_C
1866618632

1866718633
BN_MP_SET_INT_C
1866818634
+--->BN_MP_SET_LONG_C
18669-
| +--->BN_MP_GROW_C
18670-
| +--->BN_MP_ZERO_C
1867118635

1867218636

1867318637
BN_MP_SET_LONG_C
18674-
+--->BN_MP_GROW_C
18675-
+--->BN_MP_ZERO_C
1867618638

1867718639

1867818640
BN_MP_SET_LONG_LONG_C
@@ -19855,7 +19817,6 @@ BN_MP_SQRTMOD_PRIME_C
1985519817
| +--->BN_MP_CLAMP_C
1985619818
+--->BN_MP_SET_INT_C
1985719819
| +--->BN_MP_SET_LONG_C
19858-
| | +--->BN_MP_GROW_C
1985919820
+--->BN_MP_SQRMOD_C
1986019821
| +--->BN_MP_INIT_C
1986119822
| +--->BN_MP_SQR_C
@@ -20593,8 +20554,6 @@ BN_MP_TC_AND_C
2059320554
| +--->BN_MP_INIT_C
2059420555
| +--->BN_MP_SET_INT_C
2059520556
| | +--->BN_MP_SET_LONG_C
20596-
| | | +--->BN_MP_GROW_C
20597-
| | | +--->BN_MP_ZERO_C
2059820557
+--->BN_MP_MUL_2D_C
2059920558
| +--->BN_MP_COPY_C
2060020559
| | +--->BN_MP_GROW_C
@@ -20655,8 +20614,6 @@ BN_MP_TC_OR_C
2065520614
| +--->BN_MP_INIT_C
2065620615
| +--->BN_MP_SET_INT_C
2065720616
| | +--->BN_MP_SET_LONG_C
20658-
| | | +--->BN_MP_GROW_C
20659-
| | | +--->BN_MP_ZERO_C
2066020617
+--->BN_MP_MUL_2D_C
2066120618
| +--->BN_MP_COPY_C
2066220619
| | +--->BN_MP_GROW_C
@@ -20698,8 +20655,6 @@ BN_MP_TC_XOR_C
2069820655
| +--->BN_MP_INIT_C
2069920656
| +--->BN_MP_SET_INT_C
2070020657
| | +--->BN_MP_SET_LONG_C
20701-
| | | +--->BN_MP_GROW_C
20702-
| | | +--->BN_MP_ZERO_C
2070320658
+--->BN_MP_MUL_2D_C
2070420659
| +--->BN_MP_COPY_C
2070520660
| | +--->BN_MP_GROW_C

‎makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,4 +156,5 @@ perlcritic:
156156
perlcritic *.pl doc/*.pl
157157

158158
astyle:
159-
astyle --options=astylerc $(OBJECTS:.o=.c) tommath*.h demo/*.c etc/*.c mtest/mtest.c
159+
@echo " * run astyle on all sources"
160+
@astyle --options=astylerc --formatted $(OBJECTS:.o=.c) tommath*.h demo/*.c etc/*.c mtest/mtest.c

0 commit comments

Comments
 (0)