Fix code review comments

Author: russell-parks

configuration.c

@@ -1617,8 +1617,8 @@ static struct config_array_setting *populate_settings_array(
    SETTING_ARRAY("cheevos_leaderboards_enable",  settings->arrays.cheevos_leaderboards_enable, true, "", true); /* deprecated */
 #endif
 
-   SETTING_ARRAY("netplay_mitm_server",          settings->arrays.netplay_mitm_server, false, NULL, true);
 #ifdef HAVE_NETWORKING
+   SETTING_ARRAY("netplay_mitm_server",          settings->arrays.netplay_mitm_server, false, NULL, true);
 #ifdef HAVE_CLOUDSYNC
    SETTING_ARRAY("webdav_url",                   settings->arrays.webdav_url, false, NULL, true);
    SETTING_ARRAY("webdav_username",              settings->arrays.webdav_username, false, NULL, true);

libretro-common/net/net_http.c

@@ -1012,11 +1012,6 @@ static bool net_http_connect(struct http_t *state)
    struct conn_pool_entry *conn = state->conn;
    struct dns_cache_entry *dns_entry = net_http_dns_cache_find(state->request.domain, state->request.port);
    /* we just used/added this in _new_socket above, if it's not there it's a big bug */
-   if (!dns_entry || !dns_entry->addr || !conn)
-   {
-      net_http_log_transport_state(state, "connect_missing_dns_or_conn", -1);
-      return false;
-   }
    addr = dns_entry->addr;
 
 #ifndef HAVE_SSL
@@ -1025,6 +1020,11 @@ static bool net_http_connect(struct http_t *state)
 #else
    if (state->ssl)
    {
+      if (!conn)
+      {
+         net_http_log_transport_state(state, "connect_missing_dns_or_conn", -1);
+         return false;
+      }
       for (next_addr = addr; conn->fd >= 0; conn->fd = socket_next((void**)&next_addr))
       {
          if (!(conn->ssl_ctx = ssl_socket_init(conn->fd, state->request.domain)))

network/cloud_sync/google_drive.c

@@ -1356,7 +1356,7 @@ static void gdrive_do_patch(gdrive_cb_state_t *cb_st)
          cb_st->path, (long long)len);
    task_push_http_transfer_with_content(url, "PATCH",
          buf, (size_t)len, "application/octet-stream",
-         true, headers, gdrive_upload_cb, cb_st);
+         true, false, headers, gdrive_upload_cb, cb_st);
    free(buf);
    free(headers);
 }

network/cloud_sync/s3.c

@@ -929,7 +929,7 @@ static bool s3_http_put_async(const char *url, const char *headers,
       const void *data, size_t data_len, s3_cb_state_t *cb_state)
 {
    return task_push_http_transfer_with_content(url, "PUT",
-         data, data_len, "application/octet-stream", true,
+         data, data_len, "application/octet-stream", true, false,
          headers, s3_update_cb, cb_state) != NULL;
 }
 
@@ -1399,7 +1399,7 @@ static void s3_multipart_complete(s3_multipart_state_t *mp_st)
       goto fail;
 
    if (!task_push_http_transfer_with_content(url_with_query, "POST",
-            xml_body, xml_len, "application/xml", true,
+            xml_body, xml_len, "application/xml", true, false,
             auth_header, s3_multipart_complete_cb, mp_st))
       goto fail;
 
@@ -1500,7 +1500,7 @@ static void s3_multipart_upload_next_part(s3_multipart_state_t *mp_st)
    if (!url_with_query || !auth_header)
       goto fail;
 
-   if (!task_push_http_transfer_with_content_ex(url_with_query, "PUT",
+   if (!task_push_http_transfer_with_content(url_with_query, "PUT",
             mp_st->file_data + offset, content_len, "application/octet-stream", true, true,
             auth_header, s3_multipart_upload_part_cb, mp_st))
       goto fail;

pkg/apple/BaseConfig.xcconfig

@@ -74,6 +74,7 @@ OTHER_CFLAGS = $(inherited) -DHAVE_RPNG
 OTHER_CFLAGS = $(inherited) -DHAVE_RTGA
 OTHER_CFLAGS = $(inherited) -DHAVE_RUNAHEAD
 OTHER_CFLAGS = $(inherited) -DHAVE_RWAV
+OTHER_CFLAGS = $(inherited) -DHAVE_S3
 OTHER_CFLAGS = $(inherited) -DHAVE_SCREENSHOTS
 OTHER_CFLAGS = $(inherited) -DHAVE_SHADERPIPELINE
 OTHER_CFLAGS = $(inherited) -DHAVE_SLANG

pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj

@@ -1911,7 +1911,6 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ANALYZER_DEADCODE_DEADSTORES = NO;
-				COMMON_SDL_CFLAGS = "-DHAVE_S3";
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_HARDENED_RUNTIME = YES;
 			};
@@ -1924,7 +1923,6 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ANALYZER_DEADCODE_DEADSTORES = NO;
-				COMMON_SDL_CFLAGS = "-DHAVE_S3";
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_HARDENED_RUNTIME = YES;
 			};

tasks/task_http.c

@@ -552,11 +552,10 @@ void* task_push_http_post_transfer_with_headers(const char *url,
    return task_push_http_transfer_generic(conn, url, mute, false, cb, user_data);
 }
 
-void *task_push_http_transfer_with_content_ex(const char *url,
+void *task_push_http_transfer_with_content(const char *url,
       const char *method, const void *content, size_t content_len,
       const char *content_type, bool mute, bool headers_accept_err,
-      const char *headers,
-      retro_task_callback_t cb, void *user_data)
+      const char *headers, retro_task_callback_t cb, void *user_data)
 {
    struct http_connection_t *conn;
 
@@ -576,13 +575,3 @@ void *task_push_http_transfer_with_content_ex(const char *url,
    return task_push_http_transfer_generic(conn, url, mute,
          headers_accept_err, cb, user_data);
 }
-
-void *task_push_http_transfer_with_content(const char *url,
-      const char *method, const void *content, size_t content_len,
-      const char *content_type, bool mute, const char *headers,
-      retro_task_callback_t cb, void *user_data)
-{
-   return task_push_http_transfer_with_content_ex(url, method, content,
-         content_len, content_type, mute, false,
-         headers, cb, user_data);
-}

tasks/tasks_internal.h

@@ -80,10 +80,6 @@ void *task_push_http_post_transfer_with_headers(const char *url, const char *pos
    const char *type, const char *headers, retro_task_callback_t cb, void *user_data);
 
 void *task_push_http_transfer_with_content(const char *url, const char *method,
-   const void *content, size_t content_len, const char *content_type, bool mute,
-   const char *headers, retro_task_callback_t cb, void *user_data);
-
-void *task_push_http_transfer_with_content_ex(const char *url, const char *method,
    const void *content, size_t content_len, const char *content_type, bool mute,
    bool headers_accept_err, const char *headers,
    retro_task_callback_t cb, void *user_data);