From a623242075d23c9f7f4530c2fda5073e1658603f Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 11 Oct 2016 16:13:03 +0000
Subject: [PATCH] deprecate USE_SSL for USE_TLS, rename in code

---
 src/gns/gnunet-gns-proxy.c                   |  2 +-
 src/my/my.c                                  |  1 +
 src/mysql/mysql.c                            | 21 ++++++++++++--------
 src/transport/plugin_transport_http_server.c |  2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index ef9c7bf62..477444919 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -2302,7 +2302,7 @@ lookup_ssl_httpd (const char* domain)
   hd->is_ssl = GNUNET_YES;
   hd->domain = GNUNET_strdup (domain);
   hd->proxy_cert = pgc;
-  hd->daemon = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_SSL | MHD_USE_NO_LISTEN_SOCKET,
+  hd->daemon = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_TLS | MHD_USE_NO_LISTEN_SOCKET,
                                  0,
                                  NULL, NULL,
                                  &create_response, hd,
diff --git a/src/my/my.c b/src/my/my.c
index 5816663b6..459f09b6a 100644
--- a/src/my/my.c
+++ b/src/my/my.c
@@ -181,6 +181,7 @@ GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh,
                         stmt,
                         field_off,
                         &result[field_off]))
+
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                     "Pre-conversion for MySQL result failed at offset %u\n",
diff --git a/src/mysql/mysql.c b/src/mysql/mysql.c
index acd54a288..bebbfbe0f 100644
--- a/src/mysql/mysql.c
+++ b/src/mysql/mysql.c
@@ -197,7 +197,7 @@ get_my_cnf_path (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * our default options).
  *
  * @param mc database context to initialze
- * @return GNUNET_OK on success
+ * @return #GNUNET_OK on success
  */
 static int
 iopen (struct GNUNET_MYSQL_Context *mc)
@@ -300,7 +300,8 @@ GNUNET_MYSQL_context_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
   mc = GNUNET_new (struct GNUNET_MYSQL_Context);
   mc->cfg = cfg;
   mc->section = section;
-  mc->cnffile = get_my_cnf_path (cfg, section);
+  mc->cnffile = get_my_cnf_path (cfg,
+                                 section);
 
   return mc;
 }
@@ -383,18 +384,22 @@ GNUNET_MYSQL_statement_prepare (struct GNUNET_MYSQL_Context *mc,
  *
  * @param mc mysql context
  * @param sql SQL statement to run
- * @return GNUNET_OK on success
- *         GNUNET_SYSERR if there was a problem
+ * @return #GNUNET_OK on success
+ *         #GNUNET_SYSERR if there was a problem
  */
 int
-GNUNET_MYSQL_statement_run (struct GNUNET_MYSQL_Context *mc, const char *sql)
+GNUNET_MYSQL_statement_run (struct GNUNET_MYSQL_Context *mc,
+                            const char *sql)
 {
-  if ((NULL == mc->dbf) && (GNUNET_OK != iopen (mc)))
+  if ( (NULL == mc->dbf) &&
+       (GNUNET_OK != iopen (mc)) )
     return GNUNET_SYSERR;
   mysql_query (mc->dbf, sql);
   if (mysql_error (mc->dbf)[0])
   {
-    LOG_MYSQL (GNUNET_ERROR_TYPE_ERROR, "mysql_query", mc);
+    LOG_MYSQL (GNUNET_ERROR_TYPE_ERROR,
+               "mysql_query",
+               mc);
     GNUNET_MYSQL_statements_invalidate (mc);
     return GNUNET_SYSERR;
   }
@@ -407,7 +412,7 @@ GNUNET_MYSQL_statement_run (struct GNUNET_MYSQL_Context *mc, const char *sql)
  *
  * @param mc mysql context
  * @param sh statement handle to prepare
- * @return GNUNET_OK on success
+ * @return #GNUNET_OK on success
  */
 static int
 prepare_statement (struct GNUNET_MYSQL_StatementHandle *sh)
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index 5088f2e77..1a2f5d21a 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -2200,7 +2200,7 @@ run_mhd_start_daemon (struct HTTP_Server_Plugin *plugin,
                              MHD_USE_DEBUG |
 #endif
 #if BUILD_HTTPS
-                             MHD_USE_SSL |
+                             MHD_USE_TLS |
 #endif
                              MHD_USE_SUSPEND_RESUME |
                              v6,
-- 
2.25.1