From 70308e0a4ac548ed9ec04ef91fc836d77a4b0edc Mon Sep 17 00:00:00 2001 From: fpagliughi Date: Mon, 16 Jan 2023 16:23:09 -0500 Subject: [PATCH] Minor cleanup --- examples/linux/CMakeLists.txt | 5 +---- examples/linux/canrecv.cpp | 8 +++----- include/sockpp/can_address.h | 1 - src/linux/can_socket.cpp | 1 + src/socket.cpp | 2 +- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/examples/linux/CMakeLists.txt b/examples/linux/CMakeLists.txt index 5270fe0..c246427 100644 --- a/examples/linux/CMakeLists.txt +++ b/examples/linux/CMakeLists.txt @@ -45,10 +45,8 @@ set(EXECUTABLES ) foreach(EXECUTABLE ${EXECUTABLES}) - # --- Executables --- add_executable(${EXECUTABLE} ${EXECUTABLE}.cpp) - # --- Includes --- target_include_directories(${EXECUTABLE} PUBLIC ${SOCKPP_INCLUDE_DIR} @@ -56,8 +54,7 @@ foreach(EXECUTABLE ${EXECUTABLES}) ${SOCKPP_GENERATED_DIR}/include ) - # --- Link for executables --- - target_link_libraries(${EXECUTABLE} ${SOCKPP_LIB}) + target_link_libraries(${EXECUTABLE} ${SOCKPP_LIB}) endforeach() # --- Install examples --- diff --git a/examples/linux/canrecv.cpp b/examples/linux/canrecv.cpp index 02675c4..1bbe226 100644 --- a/examples/linux/canrecv.cpp +++ b/examples/linux/canrecv.cpp @@ -6,7 +6,7 @@ // -------------------------------------------------------------------------- // This file is part of the "sockpp" C++ socket library. // -// Copyright (c) 2021 Frank Pagliughi +// Copyright (c) 2021-2023 Frank Pagliughi // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -58,7 +58,7 @@ using sysclock = chrono::system_clock; int main(int argc, char* argv[]) { - cout << "Sample SocketCAN writer for 'sockpp' " + cout << "Sample SocketCAN reader for 'sockpp' " << sockpp::SOCKPP_VERSION << endl; string canIface = (argc > 1) ? argv[1] : "can0"; @@ -70,14 +70,12 @@ int main(int argc, char* argv[]) sockpp::can_socket sock(addr); if (!sock) { - cerr << "Error binding to the CAN interface " << canIface << "\n\t" + cerr << "Error binding to the CAN interface '" << canIface << "'\n\t" << sock.last_error_str() << endl; return 1; } cout << "Created CAN socket on " << sock.address() << endl; - time_t t = sysclock::to_time_t(sysclock::now()); - cout.setf(ios::fixed, ios::floatfield); cout << setfill('0'); diff --git a/include/sockpp/can_address.h b/include/sockpp/can_address.h index a01dbd5..28c150a 100644 --- a/include/sockpp/can_address.h +++ b/include/sockpp/can_address.h @@ -53,7 +53,6 @@ #include #include #include - #include namespace sockpp { diff --git a/src/linux/can_socket.cpp b/src/linux/can_socket.cpp index dc7e699..0e237ca 100644 --- a/src/linux/can_socket.cpp +++ b/src/linux/can_socket.cpp @@ -37,6 +37,7 @@ #include "sockpp/can_socket.h" #include "sockpp/socket.h" #include +#include using namespace std; using namespace std::chrono; diff --git a/src/socket.cpp b/src/socket.cpp index 1f3d850..6c13ca9 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -65,7 +65,7 @@ timeval to_timeval(const microseconds& dur) } ///////////////////////////////////////////////////////////////////////////// -// socket +// socket ///////////////////////////////////////////////////////////////////////////// int socket::get_last_error()