Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some clean-ups #305

Merged
merged 6 commits into from
Oct 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.*
*.o
*.lo
*.la
Expand Down Expand Up @@ -59,3 +60,5 @@ tests/*.log
tests/*.trs
tests/test-suite.log
README
compile_commands.json
*.plist
4 changes: 2 additions & 2 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,11 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].

Community Impact Guidelines were inspired by
Community Impact Guidelines were inspired by
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].

For answers to common questions about this code of conduct, see the FAQ at
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
at [https://www.contributor-covenant.org/translations][translations].

[homepage]: https://www.contributor-covenant.org
Expand Down
2 changes: 2 additions & 0 deletions include/mptcpd/path_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#ifndef MPTCPD_LIB_PATH_MANAGER_H
#define MPTCPD_LIB_PATH_MANAGER_H

#include <stdbool.h>

#include <mptcpd/export.h>
#include <mptcpd/types.h>

Expand Down
2 changes: 2 additions & 0 deletions include/mptcpd/private/configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#ifndef MPTCPD_CONFIGURATION_H
#define MPTCPD_CONFIGURATION_H

#include <stdint.h>


/**
* Function pointer corresponding to the ELL functions that set the
Expand Down
2 changes: 2 additions & 0 deletions include/mptcpd/private/id_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#ifndef MPTCPD_PRIVATE_ID_MANAGER_H
#define MPTCPD_PRIVATE_ID_MANAGER_H

#include <stdbool.h>

#include <mptcpd/export.h>
#include <mptcpd/types.h>

Expand Down
2 changes: 2 additions & 0 deletions include/mptcpd/private/path_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#ifndef MPTCPD_PRIVATE_PATH_MANAGER_H
#define MPTCPD_PRIVATE_PATH_MANAGER_H

#include <stdbool.h>

#include <mptcpd/types.h>


Expand Down
1 change: 0 additions & 1 deletion lib/id_manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#define _POSIX_C_SOURCE 200112L ///< For XSI-compliant strerror_r().

#include <assert.h>
#include <errno.h>
#include <stdint.h>
#include <string.h>
#include <sys/socket.h>
Expand Down
6 changes: 3 additions & 3 deletions lib/plugin.c
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ static void load_plugin(char const *filename)
static void load_plugins_queue(char const *dir,
struct l_queue const* plugins_to_load)
{
struct l_queue_entry const *entry =
struct l_queue_entry const *entry =
l_queue_get_entries((struct l_queue *) plugins_to_load);

while (entry) {
Expand Down Expand Up @@ -359,8 +359,8 @@ static int load_plugins_all(int const fd,
}


static int load_plugins(char const *dir,
struct l_queue const *plugins_to_load,
static int load_plugins(char const *dir,
struct l_queue const *plugins_to_load,
struct mptcpd_pm *pm)
{
/**
Expand Down
2 changes: 1 addition & 1 deletion man/mptcpd.8.in
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ overriding plugin priorities
.TP
.BI \-\-load\-plugins= PLUGINS
set plugins to load on startup, where
.I PLUGINS
.I PLUGINS
is a comma separated list containing one or more plugin names

.TP
Expand Down
1 change: 0 additions & 1 deletion src/configuration.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <stdio.h>
#include <stdbool.h>
#include <argp.h>
#include <ctype.h> // For isalnum().
#include <assert.h>
#include <sys/types.h>
#include <sys/stat.h>
Expand Down
1 change: 0 additions & 1 deletion src/path_manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <errno.h>
#include <unistd.h>

#include <arpa/inet.h> // For inet_ntop().
Expand Down
2 changes: 0 additions & 2 deletions tests/lib/call_count.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
* Copyright (c) 2019, 2022, Intel Corporation
*/

#include <stdlib.h>

#include "test-plugin.h"


Expand Down
2 changes: 1 addition & 1 deletion tests/mptcpwrap-tester.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static void test_socket_data(struct socket_data const *data)
assert(verified);
}

int main()
int main(void)
{
/*
libmptcpwrap.so should be preloaded when running this
Expand Down
2 changes: 1 addition & 1 deletion tests/test-addr-info.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ static void test_addr_info(void const *test_data)

in_addr_t const addr = htonl(0xC0000201); // 192.0.2.1
in_port_t const port = htons(0x1234);

struct mptcpd_addr_info info = {
.id = 5,
.flags = 10,
Expand Down
2 changes: 0 additions & 2 deletions tests/test-cxx-build.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
* Copyright (c) 2019, 2021-2022, Intel Corporation
*/

#include <memory>

#include <ell/main.h>
#include <ell/idle.h>
#include <ell/log.h>
Expand Down