diff options
Diffstat (limited to 'src/testbed/testbed_api_topology.c')
-rw-r--r-- | src/testbed/testbed_api_topology.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c index 7d0ccd269..114055a07 100644 --- a/src/testbed/testbed_api_topology.c +++ b/src/testbed/testbed_api_topology.c | |||
@@ -2,20 +2,18 @@ | |||
2 | This file is part of GNUnet | 2 | This file is part of GNUnet |
3 | Copyright (C) 2008--2013 GNUnet e.V. | 3 | Copyright (C) 2008--2013 GNUnet e.V. |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software: you can redistribute it and/or modify it |
6 | it under the terms of the GNU General Public License as published | 6 | under the terms of the GNU Affero General Public License as published |
7 | by the Free Software Foundation; either version 3, or (at your | 7 | by the Free Software Foundation, either version 3 of the License, |
8 | option) any later version. | 8 | or (at your option) any later version. |
9 | 9 | ||
10 | GNUnet is distributed in the hope that it will be useful, but | 10 | GNUnet is distributed in the hope that it will be useful, but |
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | General Public License for more details. | 13 | Affero General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU Affero General Public License |
16 | along with GNUnet; see the file COPYING. If not, write to the | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
18 | Boston, MA 02110-1301, USA. | ||
19 | */ | 17 | */ |
20 | 18 | ||
21 | /** | 19 | /** |
@@ -1393,7 +1391,7 @@ GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls, | |||
1393 | } | 1391 | } |
1394 | do | 1392 | do |
1395 | { | 1393 | { |
1396 | secondary_option = va_arg (va, enum GNUNET_TESTBED_TopologyOption); | 1394 | secondary_option = GNUNET_VA_ARG_ENUM (va, GNUNET_TESTBED_TopologyOption); |
1397 | 1395 | ||
1398 | switch (secondary_option) | 1396 | switch (secondary_option) |
1399 | { | 1397 | { |
@@ -1554,7 +1552,7 @@ GNUNET_TESTBED_underlay_construct_ (int num_peers, | |||
1554 | tc.type = TOPOLOGYCONTEXT_TYPE_UNDERLAY; | 1552 | tc.type = TOPOLOGYCONTEXT_TYPE_UNDERLAY; |
1555 | underlay = &tc.u.underlay; | 1553 | underlay = &tc.u.underlay; |
1556 | va_start (vargs, cls); | 1554 | va_start (vargs, cls); |
1557 | topology = va_arg (vargs, enum GNUNET_TESTBED_TopologyOption); | 1555 | topology = GNUNET_VA_ARG_ENUM (vargs, GNUNET_TESTBED_TopologyOption); |
1558 | switch (topology) | 1556 | switch (topology) |
1559 | { | 1557 | { |
1560 | case GNUNET_TESTBED_TOPOLOGY_LINE: | 1558 | case GNUNET_TESTBED_TOPOLOGY_LINE: |