diff options
author | RalphNiemeyer <rniemeyer@de.adit-jv.com> | 2017-09-05 11:51:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-05 11:51:09 +0200 |
commit | 25c8d74f11004d97344f5c2233503be5c72b0ecd (patch) | |
tree | 5e90422e94035453e2123092c7ad47b65344d993 | |
parent | cf30c443064d28bfcdaa0f4c7bf799fd5d6fed99 (diff) | |
parent | 58c4d9fe01c7af573b591eb0c22ff15aa1c172b7 (diff) | |
download | DLT-daemon-25c8d74f11004d97344f5c2233503be5c72b0ecd.tar.gz |
Merge pull request #24 from baduras/some-minor-fixes
Minor fixes for typo in CMakeLists and merge issue
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/daemon/dlt_daemon_client.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f05d566..1889a4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,7 @@ option(WITH_TESTSCRIPTS "Set to ON to run CMakeLists.txt in testscripts" option(WITH_GPROF "Set -pg to compile flags" OFF ) option(WITH_DLTTEST "Set to ON to build with modifications to test User-Daemon communication with corrupt messages" OFF) option(WITH_DLT_SHM_ENABLE "EXPERIMENTAL! Set to ON to use shared memory as IPC. EXPERIMENTAL!" OFF ) -option(WTIH_DLT_ADAPTOR "Set to ON to build src/adaptor binaries" ON) +option(WITH_DLT_ADAPTOR "Set to ON to build src/adaptor binaries" ON) option(WITH_DLT_CONSOLE "Set to ON to build src/console binaries" ON) option(WITH_DLT_EXAMPLES "Set to ON to build src/examples binaries" ON) option(WITH_DLT_SYSTEM "Set to ON to build src/system binaries" ON) @@ -218,7 +218,7 @@ message( STATUS "WITH_SYSTEMD_JOURNAL = ${WITH_SYSTEMD_JOURNAL}" ) message( STATUS "WITH_DOC = ${WITH_DOC}" ) message( STATUS "WITH_MAN = ${WITH_MAN}" ) -message( STATUS "WTIH_DLT_ADAPTOR = ${WTIH_DLT_ADAPTOR}") +message( STATUS "WITH_DLT_ADAPTOR = ${WITH_DLT_ADAPTOR}") message( STATUS "WITH_DLT_CONSOLE = ${WITH_DLT_CONSOLE}") message( STATUS "WITH_DLT_EXAMPLES = ${WITH_DLT_EXAMPLES}") message( STATUS "WITH_DLT_SYSTEM = ${WITH_DLT_SYSTEM}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1457578..80c4bc7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,9 +27,9 @@ if( WITH_DLT_EXAMPLES ) add_subdirectory( examples ) endif( WITH_DLT_EXAMPLES ) -if( WTIH_DLT_ADAPTOR ) +if( WITH_DLT_ADAPTOR ) add_subdirectory( adaptor ) -endif( WTIH_DLT_ADAPTOR ) +endif( WITH_DLT_ADAPTOR ) if( WITH_DLT_TESTS ) add_subdirectory( tests ) diff --git a/src/daemon/dlt_daemon_client.c b/src/daemon/dlt_daemon_client.c index 84ffd5d..a9d9440 100644 --- a/src/daemon/dlt_daemon_client.c +++ b/src/daemon/dlt_daemon_client.c @@ -2210,7 +2210,7 @@ void dlt_daemon_control_service_logstorage(int sock, DltDaemon *daemon, DltDaemo dlt_daemon_logstorage_reset_application_loglevel(daemon, device_index, daemon_local->flags.offlineLogstorageMaxDevices, verbose); dlt_logstorage_device_disconnected(&(daemon->storage_handle[device_index]), -+ DLT_LOGSTORAGE_SYNC_ON_DEVICE_DISCONNECT); + DLT_LOGSTORAGE_SYNC_ON_DEVICE_DISCONNECT); dlt_daemon_control_service_response(sock, daemon, daemon_local, DLT_SERVICE_ID_OFFLINE_LOGSTORAGE, DLT_SERVICE_RESPONSE_OK, verbose); } |