From 6e03d3470ca6f7c5bdfad6def41b0f0eaf9d33a6 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sat, 4 Jan 2025 10:13:49 -0800 Subject: api: remove old protocol headers --- src/sp/device_test.c | 4 +--- src/sp/multistress_test.c | 11 ----------- src/sp/nonblock_test.c | 2 -- src/sp/pipe_test.c | 5 +---- src/sp/protocol/bus0/CMakeLists.txt | 5 ++--- src/sp/protocol/bus0/bus_test.c | 2 -- src/sp/protocol/pair0/CMakeLists.txt | 3 +-- src/sp/protocol/pair1/CMakeLists.txt | 6 ++---- src/sp/protocol/pipeline0/CMakeLists.txt | 4 +--- src/sp/protocol/pubsub0/CMakeLists.txt | 4 +--- src/sp/protocol/pubsub0/sub_test.c | 3 +-- src/sp/protocol/pubsub0/xsub_test.c | 3 +-- src/sp/protocol/reqrep0/CMakeLists.txt | 4 +--- src/sp/protocol/survey0/CMakeLists.txt | 6 ++---- src/sp/transport/socket/sockfd_test.c | 1 - src/tools/nngcat/nngcat.c | 11 ----------- src/tools/perf/pubdrop.c | 3 --- 17 files changed, 14 insertions(+), 63 deletions(-) (limited to 'src') diff --git a/src/sp/device_test.c b/src/sp/device_test.c index 6d2ff1fb..7d25aaa5 100644 --- a/src/sp/device_test.c +++ b/src/sp/device_test.c @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. +// Copyright 2025 Staysail Systems, Inc. // Copyright 2018 Capitar IT Group BV // // This software is supplied under the terms of the MIT License, a @@ -11,8 +11,6 @@ #include #include -#include -#include #include diff --git a/src/sp/multistress_test.c b/src/sp/multistress_test.c index 5ffc4c4f..394835e5 100644 --- a/src/sp/multistress_test.c +++ b/src/sp/multistress_test.c @@ -13,17 +13,6 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include diff --git a/src/sp/nonblock_test.c b/src/sp/nonblock_test.c index c06fa64d..cb87f0af 100644 --- a/src/sp/nonblock_test.c +++ b/src/sp/nonblock_test.c @@ -23,8 +23,6 @@ #endif #include -#include -#include #include diff --git a/src/sp/pipe_test.c b/src/sp/pipe_test.c index 7a50c133..8f668d8c 100644 --- a/src/sp/pipe_test.c +++ b/src/sp/pipe_test.c @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. +// Copyright 2025 Staysail Systems, Inc. // Copyright 2018 Capitar IT Group BV // // This software is supplied under the terms of the MIT License, a @@ -12,9 +12,6 @@ #include #include -#include -#include - #include struct testcase { diff --git a/src/sp/protocol/bus0/CMakeLists.txt b/src/sp/protocol/bus0/CMakeLists.txt index ca7ee9bc..b235204c 100644 --- a/src/sp/protocol/bus0/CMakeLists.txt +++ b/src/sp/protocol/bus0/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2021 Staysail Systems, Inc. +# Copyright 2025 Staysail Systems, Inc. # Copyright 2018 Capitar IT Group BV # # This software is supplied under the terms of the MIT License, a @@ -12,7 +12,6 @@ nng_directory(bus0) nng_sources_if(NNG_PROTO_BUS0 bus.c) -nng_headers_if(NNG_PROTO_BUS0 nng/protocol/bus0/bus.h) nng_defines_if(NNG_PROTO_BUS0 NNG_HAVE_BUS0) -nng_test(bus_test) \ No newline at end of file +nng_test(bus_test) diff --git a/src/sp/protocol/bus0/bus_test.c b/src/sp/protocol/bus0/bus_test.c index d8b71c63..b1141d93 100644 --- a/src/sp/protocol/bus0/bus_test.c +++ b/src/sp/protocol/bus0/bus_test.c @@ -10,8 +10,6 @@ #include "nng/nng.h" #include -#include - #define SECOND 1000 #define BUS0_SELF 0x70 diff --git a/src/sp/protocol/pair0/CMakeLists.txt b/src/sp/protocol/pair0/CMakeLists.txt index 2f74e139..af5a43da 100644 --- a/src/sp/protocol/pair0/CMakeLists.txt +++ b/src/sp/protocol/pair0/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2021 Staysail Systems, Inc. +# Copyright 2025 Staysail Systems, Inc. # Copyright 2018 Capitar IT Group BV # # This software is supplied under the terms of the MIT License, a @@ -12,6 +12,5 @@ nng_directory(pair0) nng_sources_if(NNG_PROTO_PAIR0 pair.c) -nng_headers_if(NNG_PROTO_PAIR0 nng/protocol/pair0/pair.h) nng_defines_if(NNG_PROTO_PAIR0 NNG_HAVE_PAIR0) nng_test(pair0_test) diff --git a/src/sp/protocol/pair1/CMakeLists.txt b/src/sp/protocol/pair1/CMakeLists.txt index 12e12607..06d764a0 100644 --- a/src/sp/protocol/pair1/CMakeLists.txt +++ b/src/sp/protocol/pair1/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2019 Staysail Systems, Inc. +# Copyright 2025 Staysail Systems, Inc. # Copyright 2018 Capitar IT Group BV # # This software is supplied under the terms of the MIT License, a @@ -11,10 +11,8 @@ # PAIRv1 protocol nng_directory(pair1) -# XXX: break pair1_poly into an ifdef. nng_sources_if(NNG_PROTO_PAIR1 pair.c pair1_poly.c) -nng_headers_if(NNG_PROTO_PAIR1 nng/protocol/pair1/pair.h) nng_defines_if(NNG_PROTO_PAIR1 NNG_HAVE_PAIR1) nng_test(pair1_test) -nng_test(pair1_poly_test) \ No newline at end of file +nng_test(pair1_poly_test) diff --git a/src/sp/protocol/pipeline0/CMakeLists.txt b/src/sp/protocol/pipeline0/CMakeLists.txt index 8a10eab7..4838067a 100644 --- a/src/sp/protocol/pipeline0/CMakeLists.txt +++ b/src/sp/protocol/pipeline0/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2019 Staysail Systems, Inc. +# Copyright 2025 Staysail Systems, Inc. # Copyright 2018 Capitar IT Group BV # # This software is supplied under the terms of the MIT License, a @@ -12,11 +12,9 @@ nng_directory(pipeline0) nng_sources_if(NNG_PROTO_PUSH0 push.c) -nng_headers_if(NNG_PROTO_PUSH0 nng/protocol/pipeline0/push.h) nng_defines_if(NNG_PROTO_PUSH0 NNG_HAVE_PUSH0) nng_sources_if(NNG_PROTO_PULL0 pull.c) -nng_headers_if(NNG_PROTO_PULL0 nng/protocol/pipeline0/pull.h) nng_defines_if(NNG_PROTO_PULL0 NNG_HAVE_PULL0) nng_test(pull_test) diff --git a/src/sp/protocol/pubsub0/CMakeLists.txt b/src/sp/protocol/pubsub0/CMakeLists.txt index 160b7462..46c37995 100644 --- a/src/sp/protocol/pubsub0/CMakeLists.txt +++ b/src/sp/protocol/pubsub0/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2019 Staysail Systems, Inc. +# Copyright 2025 Staysail Systems, Inc. # Copyright 2018 Capitar IT Group BV # # This software is supplied under the terms of the MIT License, a @@ -12,11 +12,9 @@ nng_directory(pubsub0) nng_sources_if(NNG_PROTO_PUB0 pub.c) -nng_headers_if(NNG_PROTO_PUB0 nng/protocol/pubsub0/pub.h) nng_defines_if(NNG_PROTO_PUB0 NNG_HAVE_PUB0) nng_sources_if(NNG_PROTO_SUB0 sub.c xsub.c) -nng_headers_if(NNG_PROTO_SUB0 nng/protocol/pubsub0/sub.h) nng_defines_if(NNG_PROTO_SUB0 NNG_HAVE_SUB0) nng_test(pub_test) diff --git a/src/sp/protocol/pubsub0/sub_test.c b/src/sp/protocol/pubsub0/sub_test.c index 5c72b8bd..13fc07bf 100644 --- a/src/sp/protocol/pubsub0/sub_test.c +++ b/src/sp/protocol/pubsub0/sub_test.c @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. +// Copyright 2025 Staysail Systems, Inc. // // This software is supplied under the terms of the MIT License, a // copy of which should be located in the distribution where this @@ -8,7 +8,6 @@ // #include "nng/nng.h" -#include "nng/protocol/pubsub0/sub.h" #include static void diff --git a/src/sp/protocol/pubsub0/xsub_test.c b/src/sp/protocol/pubsub0/xsub_test.c index 618703b5..859ab532 100644 --- a/src/sp/protocol/pubsub0/xsub_test.c +++ b/src/sp/protocol/pubsub0/xsub_test.c @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. +// Copyright 2025 Staysail Systems, Inc. // // This software is supplied under the terms of the MIT License, a // copy of which should be located in the distribution where this @@ -8,7 +8,6 @@ // #include -#include #include static void diff --git a/src/sp/protocol/reqrep0/CMakeLists.txt b/src/sp/protocol/reqrep0/CMakeLists.txt index b5d44759..f6ad34b1 100644 --- a/src/sp/protocol/reqrep0/CMakeLists.txt +++ b/src/sp/protocol/reqrep0/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2020 Staysail Systems, Inc. +# Copyright 2025 Staysail Systems, Inc. # Copyright 2018 Capitar IT Group BV # # This software is supplied under the terms of the MIT License, a @@ -12,11 +12,9 @@ nng_directory(reqrep0) nng_sources_if(NNG_PROTO_REQ0 req.c xreq.c) -nng_headers_if(NNG_PROTO_REQ0 nng/protocol/reqrep0/req.h) nng_defines_if(NNG_PROTO_REQ0 NNG_HAVE_REQ0) nng_sources_if(NNG_PROTO_REP0 rep.c xrep.c) -nng_headers_if(NNG_PROTO_REP0 nng/protocol/reqrep0/rep.h) nng_defines_if(NNG_PROTO_REP0 NNG_HAVE_REP0) nng_test(req_test) diff --git a/src/sp/protocol/survey0/CMakeLists.txt b/src/sp/protocol/survey0/CMakeLists.txt index b5daca41..9397da9f 100644 --- a/src/sp/protocol/survey0/CMakeLists.txt +++ b/src/sp/protocol/survey0/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2020 Staysail Systems, Inc. +# Copyright 2025 Staysail Systems, Inc. # Copyright 2018 Capitar IT Group BV # # This software is supplied under the terms of the MIT License, a @@ -12,14 +12,12 @@ nng_directory(survey0) nng_sources_if(NNG_PROTO_SURVEYOR0 survey.c xsurvey.c) -nng_headers_if(NNG_PROTO_SURVEYOR0 nng/protocol/survey0/survey.h) nng_defines_if(NNG_PROTO_SURVEYOR0 NNG_HAVE_SURVEYOR0) nng_sources_if(NNG_PROTO_RESPONDENT0 respond.c xrespond.c) -nng_headers_if(NNG_PROTO_RESPONDENT0 nng/protocol/survey0/respond.h) nng_defines_if(NNG_PROTO_RESPONDENT0 NNG_HAVE_RESPONDENT0) nng_test(respond_test) nng_test(survey_test) nng_test(xrespond_test) -nng_test(xsurvey_test) \ No newline at end of file +nng_test(xsurvey_test) diff --git a/src/sp/transport/socket/sockfd_test.c b/src/sp/transport/socket/sockfd_test.c index e5d62f5d..ccd67587 100644 --- a/src/sp/transport/socket/sockfd_test.c +++ b/src/sp/transport/socket/sockfd_test.c @@ -10,7 +10,6 @@ // found online at https://opensource.org/licenses/MIT. // -#include "nng/protocol/pubsub0/sub.h" #include #include diff --git a/src/tools/nngcat/nngcat.c b/src/tools/nngcat/nngcat.c index 6f0d7d97..29a8d928 100644 --- a/src/tools/nngcat/nngcat.c +++ b/src/tools/nngcat/nngcat.c @@ -18,17 +18,6 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include diff --git a/src/tools/perf/pubdrop.c b/src/tools/perf/pubdrop.c index 6f0e5553..1788a3cf 100644 --- a/src/tools/perf/pubdrop.c +++ b/src/tools/perf/pubdrop.c @@ -21,9 +21,6 @@ // etc. It actually uses a wild card subscription for now. #if defined(NNG_HAVE_PUB0) && defined(NNG_HAVE_SUB0) -#include -#include - #else #define NNG_OPT_SUB_SUBSCRIBE "sub:subscribe" -- cgit v1.2.3-70-g09d2