diff --git a/cmake/BuildShapito.cmake b/cmake/BuildShapito.cmake index 25f88332..ac1d0c7a 100644 --- a/cmake/BuildShapito.cmake +++ b/cmake/BuildShapito.cmake @@ -3,14 +3,14 @@ macro(build_shapito) set(SHAPITO_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/lib/shapito/src) if (${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR}) add_custom_command( - OUTPUT ${PROJECT_BINARY_DIR}/lib/shapito/src/libsoprano${CMAKE_STATIC_LIBRARY_SUFFIX} + OUTPUT ${PROJECT_BINARY_DIR}/lib/shapito/src/libshapito${CMAKE_STATIC_LIBRARY_SUFFIX} COMMAND ${CMAKE_COMMAND} ${PROJECT_BINARY_DIR}/lib/shapito -DBUILD_STATIC=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} COMMAND ${CMAKE_MAKE_PROGRAM} -C ${PROJECT_BINARY_DIR}/lib/shapito WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/lib/shapito ) else() add_custom_command( - OUTPUT ${PROJECT_BINARY_DIR}/lib/shapito/src/libsoprano${CMAKE_STATIC_LIBRARY_SUFFIX} + OUTPUT ${PROJECT_BINARY_DIR}/lib/shapito/src/libshapito{CMAKE_STATIC_LIBRARY_SUFFIX} COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/lib/shapito COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/lib/shapito ${PROJECT_BINARY_DIR}/lib/shapito COMMAND cd ${PROJECT_BINARY_DIR}/lib/shapito && ${CMAKE_COMMAND} -DBUILD_STATIC=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} . @@ -18,10 +18,10 @@ macro(build_shapito) ) endif() add_custom_target(libshapito ALL - DEPENDS ${PROJECT_BINARY_DIR}/lib/shapito/src/libsoprano${CMAKE_STATIC_LIBRARY_SUFFIX} + DEPENDS ${PROJECT_BINARY_DIR}/lib/shapito/src/libshapito${CMAKE_STATIC_LIBRARY_SUFFIX} ) message(STATUS "Use shipped libshapito: ${PROJECT_SOURCE_DIR}/lib/shapito") - set (SHAPITO_LIBRARIES "${PROJECT_BINARY_DIR}/lib/shapito/src/libsoprano${CMAKE_STATIC_LIBRARY_SUFFIX}") + set (SHAPITO_LIBRARIES "${PROJECT_BINARY_DIR}/lib/shapito/src/libshapito${CMAKE_STATIC_LIBRARY_SUFFIX}") set (SHAPITO_FOUND 1) add_dependencies(build_libs libshapito) endmacro(build_shapito) diff --git a/lib/shapito b/lib/shapito index c60aa925..66de5a67 160000 --- a/lib/shapito +++ b/lib/shapito @@ -1 +1 @@ -Subproject commit c60aa925b20f87ce0eeb04c6a9cbe4603c0b56b0 +Subproject commit 66de5a6746bf76d36fc46036973cc7375f5d5036 diff --git a/src/od_auth.c b/src/od_auth.c index 4317c361..73cf6879 100644 --- a/src/od_auth.c +++ b/src/od_auth.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ @@ -14,7 +14,7 @@ #include #include -#include +#include #include "od_macro.h" #include "od_version.h" diff --git a/src/od_auth.h b/src/od_auth.h index 916cc005..af27bdf7 100644 --- a/src/od_auth.h +++ b/src/od_auth.h @@ -2,7 +2,7 @@ #define OD_AUTH_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_backend.c b/src/od_backend.c index ccb685e8..6ffd53ef 100644 --- a/src/od_backend.c +++ b/src/od_backend.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ @@ -14,7 +14,7 @@ #include #include -#include +#include #include "od_macro.h" #include "od_version.h" diff --git a/src/od_backend.h b/src/od_backend.h index 2aa04718..05613b82 100644 --- a/src/od_backend.h +++ b/src/od_backend.h @@ -2,7 +2,7 @@ #define OD_BACKEND_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_cancel.c b/src/od_cancel.c index f344a943..5af54fd8 100644 --- a/src/od_cancel.c +++ b/src/od_cancel.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ @@ -14,7 +14,7 @@ #include #include -#include +#include #include "od_macro.h" #include "od_version.h" diff --git a/src/od_cancel.h b/src/od_cancel.h index c1d37478..964120dc 100644 --- a/src/od_cancel.h +++ b/src/od_cancel.h @@ -2,7 +2,7 @@ #define OD_CANCEL_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_client.h b/src/od_client.h index 4a3d1e06..a9536414 100644 --- a/src/od_client.h +++ b/src/od_client.h @@ -2,7 +2,7 @@ #define OD_CLIENT_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_client_pool.c b/src/od_client_pool.c index 945d6a75..e59c9229 100644 --- a/src/od_client_pool.c +++ b/src/od_client_pool.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ @@ -14,7 +14,7 @@ #include #include -#include +#include #include "od_macro.h" #include "od_list.h" diff --git a/src/od_client_pool.h b/src/od_client_pool.h index 96a36ea5..c6391a64 100644 --- a/src/od_client_pool.h +++ b/src/od_client_pool.h @@ -2,7 +2,7 @@ #define OD_CLIENT_POOL_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection per and request router. */ diff --git a/src/od_config.c b/src/od_config.c index 49166d9f..4ebe5412 100644 --- a/src/od_config.c +++ b/src/od_config.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_config.h b/src/od_config.h index 970c49df..a277e1d3 100644 --- a/src/od_config.h +++ b/src/od_config.h @@ -2,7 +2,7 @@ #define OD_CONFIG_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_daemon.c b/src/od_daemon.c index b026c1d0..8a2c6aa7 100644 --- a/src/od_daemon.c +++ b/src/od_daemon.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ @@ -18,7 +18,7 @@ #include #include -#include +#include #include "od_macro.h" #include "od_daemon.h" diff --git a/src/od_frontend.c b/src/od_frontend.c index f3eeece5..906f3b56 100644 --- a/src/od_frontend.c +++ b/src/od_frontend.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ @@ -14,7 +14,7 @@ #include #include -#include +#include #include "od_macro.h" #include "od_version.h" diff --git a/src/od_instance.c b/src/od_instance.c index f3a45e9e..a9494be1 100644 --- a/src/od_instance.c +++ b/src/od_instance.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ @@ -14,7 +14,7 @@ #include #include -#include +#include #include "od_macro.h" #include "od_version.h" diff --git a/src/od_io.c b/src/od_io.c index 1ca541b6..a46f7b85 100644 --- a/src/od_io.c +++ b/src/od_io.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ @@ -16,7 +16,7 @@ #include #include -#include +#include #include "od_macro.h" #include "od_pid.h" diff --git a/src/od_lex.c b/src/od_lex.c index d53bb41d..a310ff33 100644 --- a/src/od_lex.c +++ b/src/od_lex.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_lex.h b/src/od_lex.h index d6c31767..c77856c1 100644 --- a/src/od_lex.h +++ b/src/od_lex.h @@ -2,7 +2,7 @@ #define OD_LEX_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_list.h b/src/od_list.h index d9ea91f0..2dabd5a4 100644 --- a/src/od_list.h +++ b/src/od_list.h @@ -2,7 +2,7 @@ #define OD_LIST_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_log.c b/src/od_log.c index 4c92c1b5..407ca49d 100644 --- a/src/od_log.c +++ b/src/od_log.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ @@ -20,7 +20,7 @@ #include #include -#include +#include #include "od_macro.h" #include "od_pid.h" diff --git a/src/od_log.h b/src/od_log.h index 5f347265..dca2852b 100644 --- a/src/od_log.h +++ b/src/od_log.h @@ -2,7 +2,7 @@ #define OD_LOG_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_macro.h b/src/od_macro.h index 47ab29d9..6605eebc 100644 --- a/src/od_macro.h +++ b/src/od_macro.h @@ -2,7 +2,7 @@ #define OD_MACRO_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_msg.h b/src/od_msg.h index 94e34312..a40e7278 100644 --- a/src/od_msg.h +++ b/src/od_msg.h @@ -1,6 +1,12 @@ #ifndef OD_MSG_H #define OD_MSG_H +/* + * ODISSEY. + * + * PostgreSQL connection pooler and request router. +*/ + typedef enum { OD_MCLIENT_NEW, OD_MROUTER_ROUTE, diff --git a/src/od_periodic.c b/src/od_periodic.c index 538df131..437cbdad 100644 --- a/src/od_periodic.c +++ b/src/od_periodic.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ @@ -14,7 +14,7 @@ #include #include -#include +#include #include "od_macro.h" #include "od_version.h" diff --git a/src/od_periodic.h b/src/od_periodic.h index 4f7ed452..86d91e10 100644 --- a/src/od_periodic.h +++ b/src/od_periodic.h @@ -2,7 +2,7 @@ #define OD_PERIODIC_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_pid.c b/src/od_pid.c index afa2ad7d..b6151387 100644 --- a/src/od_pid.c +++ b/src/od_pid.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_pid.h b/src/od_pid.h index 29356c0b..7648fdcf 100644 --- a/src/od_pid.h +++ b/src/od_pid.h @@ -2,7 +2,7 @@ #define OD_PID_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_pooler.c b/src/od_pooler.c index 4675e094..f4b1bb21 100644 --- a/src/od_pooler.c +++ b/src/od_pooler.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ @@ -14,7 +14,7 @@ #include #include -#include +#include #include "od_macro.h" #include "od_version.h" diff --git a/src/od_pooler.h b/src/od_pooler.h index 0b1262dc..aa4d2bf6 100644 --- a/src/od_pooler.h +++ b/src/od_pooler.h @@ -2,7 +2,7 @@ #define OD_POOLER_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_relay.c b/src/od_relay.c index d2a4b1e1..c22774ec 100644 --- a/src/od_relay.c +++ b/src/od_relay.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ @@ -14,7 +14,7 @@ #include #include -#include +#include #include "od_macro.h" #include "od_version.h" diff --git a/src/od_relay.h b/src/od_relay.h index 6ca24568..57713bc4 100644 --- a/src/od_relay.h +++ b/src/od_relay.h @@ -2,7 +2,7 @@ #define OD_RELAY_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_relay_pool.c b/src/od_relay_pool.c index 88ae4a20..3ef2f3d0 100644 --- a/src/od_relay_pool.c +++ b/src/od_relay_pool.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ @@ -14,7 +14,7 @@ #include #include -#include +#include #include "od_macro.h" #include "od_version.h" diff --git a/src/od_relay_pool.h b/src/od_relay_pool.h index bdae0421..95d8ac97 100644 --- a/src/od_relay_pool.h +++ b/src/od_relay_pool.h @@ -2,7 +2,7 @@ #define OD_RELAY_POOL_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_route.h b/src/od_route.h index 22176bb8..90ef168f 100644 --- a/src/od_route.h +++ b/src/od_route.h @@ -2,7 +2,7 @@ #define OD_ROUTE_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_route_id.h b/src/od_route_id.h index 3eb6b1a2..f34278ba 100644 --- a/src/od_route_id.h +++ b/src/od_route_id.h @@ -2,7 +2,7 @@ #define OD_ROUTE_ID_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_route_pool.c b/src/od_route_pool.c index b4c1ee2f..6f431d4c 100644 --- a/src/od_route_pool.c +++ b/src/od_route_pool.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ @@ -14,7 +14,7 @@ #include #include -#include +#include #include "od_macro.h" #include "od_list.h" diff --git a/src/od_route_pool.h b/src/od_route_pool.h index 00102741..765604f5 100644 --- a/src/od_route_pool.h +++ b/src/od_route_pool.h @@ -2,7 +2,7 @@ #define OD_ROUTE_POOL_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_router.c b/src/od_router.c index 2950ed21..79fc50aa 100644 --- a/src/od_router.c +++ b/src/od_router.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ @@ -14,7 +14,7 @@ #include #include -#include +#include #include "od_macro.h" #include "od_version.h" diff --git a/src/od_router.h b/src/od_router.h index b07f84e2..512058f2 100644 --- a/src/od_router.h +++ b/src/od_router.h @@ -2,7 +2,7 @@ #define OD_ROUTER_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_scheme.c b/src/od_scheme.c index 5f29050d..4dd3a5f7 100644 --- a/src/od_scheme.c +++ b/src/od_scheme.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_scheme.h b/src/od_scheme.h index fd6138f8..f4fb1808 100644 --- a/src/od_scheme.h +++ b/src/od_scheme.h @@ -2,7 +2,7 @@ #define OD_SCHEME_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_server.h b/src/od_server.h index 5b3c15b0..1849ec6b 100644 --- a/src/od_server.h +++ b/src/od_server.h @@ -2,7 +2,7 @@ #define OD_SERVER_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_server_pool.c b/src/od_server_pool.c index a8894e07..4fba58b0 100644 --- a/src/od_server_pool.c +++ b/src/od_server_pool.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ @@ -14,7 +14,7 @@ #include #include -#include +#include #include "od_macro.h" #include "od_list.h" diff --git a/src/od_server_pool.h b/src/od_server_pool.h index 3c13f600..bcd0720b 100644 --- a/src/od_server_pool.h +++ b/src/od_server_pool.h @@ -2,7 +2,7 @@ #define OD_SERVER_POOL_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_syslog.c b/src/od_syslog.c index ab939777..df66760d 100644 --- a/src/od_syslog.c +++ b/src/od_syslog.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_syslog.h b/src/od_syslog.h index 358d8691..5a181648 100644 --- a/src/od_syslog.h +++ b/src/od_syslog.h @@ -2,7 +2,7 @@ #define OD_SYSLOG_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_system.h b/src/od_system.h index 2b3617cb..d7265959 100644 --- a/src/od_system.h +++ b/src/od_system.h @@ -2,7 +2,7 @@ #define OD_SYSTEM_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/od_tls.c b/src/od_tls.c index dfbf24d2..5f3315d5 100644 --- a/src/od_tls.c +++ b/src/od_tls.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ @@ -14,7 +14,7 @@ #include #include -#include +#include #include "od_macro.h" #include "od_version.h" diff --git a/src/od_tls.h b/src/od_tls.h index 0f0a07e2..327a4a7a 100644 --- a/src/od_tls.h +++ b/src/od_tls.h @@ -2,7 +2,7 @@ #define OD_TLS_H /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */ diff --git a/src/odissey.c b/src/odissey.c index 84743081..cee8e7ad 100644 --- a/src/odissey.c +++ b/src/odissey.c @@ -1,6 +1,6 @@ /* - * odissey. + * ODISSEY. * * PostgreSQL connection pooler and request router. */