From 0bc615438a8914183d02f7941b60cf025ff2a110 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Mon, 18 Nov 2013 19:53:39 +0100 Subject: [PATCH] Style fixes. Style fixes pointed out by Axel. I'm rusty, and it shows. Hope I got it right. Also moved get_route() into BPrivate. --- headers/private/net/RouteSupport.h | 10 +++++++++- src/kits/network/libnetapi/NetworkInterface.cpp | 2 +- src/kits/network/libnetapi/NetworkRoster.cpp | 2 +- src/kits/network/libnetapi/RouteSupport.cpp | 8 ++++++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/headers/private/net/RouteSupport.h b/headers/private/net/RouteSupport.h index b40c51801e..7c8e524fc9 100644 --- a/headers/private/net/RouteSupport.h +++ b/headers/private/net/RouteSupport.h @@ -2,13 +2,21 @@ * Copyright 2013, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT License. */ - #ifndef ROUTESUPPORT_H_ #define ROUTESUPPORT_H_ + #include + +namespace BPrivate { + + status_t get_routes(const char* interfaceName, int family, BObjectList& routes); + +} + + #endif /* __ROUTESUPPORT_H_ */ diff --git a/src/kits/network/libnetapi/NetworkInterface.cpp b/src/kits/network/libnetapi/NetworkInterface.cpp index 51614eca1f..95b41f1e99 100644 --- a/src/kits/network/libnetapi/NetworkInterface.cpp +++ b/src/kits/network/libnetapi/NetworkInterface.cpp @@ -569,7 +569,7 @@ BNetworkInterface::RemoveDefaultRoute(int family) status_t BNetworkInterface::GetRoutes(int family, BObjectList& routes) const { - return get_routes(Name(), family, routes); + return BPrivate::get_routes(Name(), family, routes); } diff --git a/src/kits/network/libnetapi/NetworkRoster.cpp b/src/kits/network/libnetapi/NetworkRoster.cpp index cc23d64130..0e969d3011 100644 --- a/src/kits/network/libnetapi/NetworkRoster.cpp +++ b/src/kits/network/libnetapi/NetworkRoster.cpp @@ -166,7 +166,7 @@ BNetworkRoster::RemoveInterface(const BNetworkInterface& interface) status_t BNetworkRoster::GetRoutes(int family, BObjectList& routes) const { - return get_routes(NULL, family, routes); + return BPrivate::get_routes(NULL, family, routes); } diff --git a/src/kits/network/libnetapi/RouteSupport.cpp b/src/kits/network/libnetapi/RouteSupport.cpp index 85c2fd3d37..291097c724 100644 --- a/src/kits/network/libnetapi/RouteSupport.cpp +++ b/src/kits/network/libnetapi/RouteSupport.cpp @@ -3,6 +3,7 @@ * Distributed under the terms of the MIT License. */ + #include #include #include @@ -11,6 +12,10 @@ #include #include + +namespace BPrivate { + + status_t get_routes(const char* interfaceName, int family, BObjectList& routes) { @@ -72,3 +77,6 @@ get_routes(const char* interfaceName, int family, BObjectList& rout return B_OK; } + + +}