odissey: update shapito submodule

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)

lib/shapito

@@ -1 +1 @@
-Subproject commit c60aa925b20f87ce0eeb04c6a9cbe4603c0b56b0
+Subproject commit 66de5a6746bf76d36fc46036973cc7375f5d5036

src/od_auth.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */
@@ -14,7 +14,7 @@
 #include <signal.h>
 
 #include <machinarium.h>
-#include <soprano.h>
+#include <shapito.h>
 
 #include "od_macro.h"
 #include "od_version.h"

src/od_auth.h

@@ -2,7 +2,7 @@
 #define OD_AUTH_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_backend.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */
@@ -14,7 +14,7 @@
 #include <signal.h>
 
 #include <machinarium.h>
-#include <soprano.h>
+#include <shapito.h>
 
 #include "od_macro.h"
 #include "od_version.h"

src/od_backend.h

@@ -2,7 +2,7 @@
 #define OD_BACKEND_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_cancel.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */
@@ -14,7 +14,7 @@
 #include <signal.h>
 
 #include <machinarium.h>
-#include <soprano.h>
+#include <shapito.h>
 
 #include "od_macro.h"
 #include "od_version.h"

src/od_cancel.h

@@ -2,7 +2,7 @@
 #define OD_CANCEL_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_client.h

@@ -2,7 +2,7 @@
 #define OD_CLIENT_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_client_pool.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */
@@ -14,7 +14,7 @@
 #include <assert.h>
 
 #include <machinarium.h>
-#include <soprano.h>
+#include <shapito.h>
 
 #include "od_macro.h"
 #include "od_list.h"

src/od_client_pool.h

@@ -2,7 +2,7 @@
 #define OD_CLIENT_POOL_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection per and request router.
 */

src/od_config.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_config.h

@@ -2,7 +2,7 @@
 #define OD_CONFIG_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_daemon.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */
@@ -18,7 +18,7 @@
 #include <sys/stat.h>
 
 #include <machinarium.h>
-#include <soprano.h>
+#include <shapito.h>
 
 #include "od_macro.h"
 #include "od_daemon.h"

src/od_frontend.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */
@@ -14,7 +14,7 @@
 #include <signal.h>
 
 #include <machinarium.h>
-#include <soprano.h>
+#include <shapito.h>
 
 #include "od_macro.h"
 #include "od_version.h"

src/od_instance.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */
@@ -14,7 +14,7 @@
 #include <signal.h>
 
 #include <machinarium.h>
-#include <soprano.h>
+#include <shapito.h>
 
 #include "od_macro.h"
 #include "od_version.h"

src/od_io.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */
@@ -16,7 +16,7 @@
 #include <arpa/inet.h>
 
 #include <machinarium.h>
-#include <soprano.h>
+#include <shapito.h>
 
 #include "od_macro.h"
 #include "od_pid.h"

src/od_lex.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_lex.h

@@ -2,7 +2,7 @@
 #define OD_LEX_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_list.h

@@ -2,7 +2,7 @@
 #define OD_LIST_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_log.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */
@@ -20,7 +20,7 @@
 #include <sys/time.h>
 
 #include <machinarium.h>
-#include <soprano.h>
+#include <shapito.h>
 
 #include "od_macro.h"
 #include "od_pid.h"

src/od_log.h

@@ -2,7 +2,7 @@
 #define OD_LOG_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_macro.h

@@ -2,7 +2,7 @@
 #define OD_MACRO_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

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,

src/od_periodic.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */
@@ -14,7 +14,7 @@
 #include <signal.h>
 
 #include <machinarium.h>
-#include <soprano.h>
+#include <shapito.h>
 
 #include "od_macro.h"
 #include "od_version.h"

src/od_periodic.h

@@ -2,7 +2,7 @@
 #define OD_PERIODIC_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_pid.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_pid.h

@@ -2,7 +2,7 @@
 #define OD_PID_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_pooler.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */
@@ -14,7 +14,7 @@
 #include <signal.h>
 
 #include <machinarium.h>
-#include <soprano.h>
+#include <shapito.h>
 
 #include "od_macro.h"
 #include "od_version.h"

src/od_pooler.h

@@ -2,7 +2,7 @@
 #define OD_POOLER_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_relay.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */
@@ -14,7 +14,7 @@
 #include <signal.h>
 
 #include <machinarium.h>
-#include <soprano.h>
+#include <shapito.h>
 
 #include "od_macro.h"
 #include "od_version.h"

src/od_relay.h

@@ -2,7 +2,7 @@
 #define OD_RELAY_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_relay_pool.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */
@@ -14,7 +14,7 @@
 #include <signal.h>
 
 #include <machinarium.h>
-#include <soprano.h>
+#include <shapito.h>
 
 #include "od_macro.h"
 #include "od_version.h"

src/od_relay_pool.h

@@ -2,7 +2,7 @@
 #define OD_RELAY_POOL_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_route.h

@@ -2,7 +2,7 @@
 #define OD_ROUTE_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_route_id.h

@@ -2,7 +2,7 @@
 #define OD_ROUTE_ID_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_route_pool.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */
@@ -14,7 +14,7 @@
 #include <assert.h>
 
 #include <machinarium.h>
-#include <soprano.h>
+#include <shapito.h>
 
 #include "od_macro.h"
 #include "od_list.h"

src/od_route_pool.h

@@ -2,7 +2,7 @@
 #define OD_ROUTE_POOL_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_router.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */
@@ -14,7 +14,7 @@
 #include <signal.h>
 
 #include <machinarium.h>
-#include <soprano.h>
+#include <shapito.h>
 
 #include "od_macro.h"
 #include "od_version.h"

src/od_router.h

@@ -2,7 +2,7 @@
 #define OD_ROUTER_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_scheme.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_scheme.h

@@ -2,7 +2,7 @@
 #define OD_SCHEME_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_server.h

@@ -2,7 +2,7 @@
 #define OD_SERVER_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_server_pool.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */
@@ -14,7 +14,7 @@
 #include <assert.h>
 
 #include <machinarium.h>
-#include <soprano.h>
+#include <shapito.h>
 
 #include "od_macro.h"
 #include "od_list.h"

src/od_server_pool.h

@@ -2,7 +2,7 @@
 #define OD_SERVER_POOL_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_syslog.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_syslog.h

@@ -2,7 +2,7 @@
 #define OD_SYSLOG_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_system.h

@@ -2,7 +2,7 @@
 #define OD_SYSTEM_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/od_tls.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */
@@ -14,7 +14,7 @@
 #include <signal.h>
 
 #include <machinarium.h>
-#include <soprano.h>
+#include <shapito.h>
 
 #include "od_macro.h"
 #include "od_version.h"

src/od_tls.h

@@ -2,7 +2,7 @@
 #define OD_TLS_H
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */

src/odissey.c

@@ -1,6 +1,6 @@
 
 /*
- * odissey.
+ * ODISSEY.
  *
  * PostgreSQL connection pooler and request router.
 */