Bug#37471922: Auto-fix clang-tidy warnings [33/n] [noclose]

Generate fixes for a number of warnings that clang-tidy can fix automatically.
This commit fixes the warning 'readability-else-after-return'.

Change example:
   if (enable_async_client)
     return async_mysql_store_result_wrapper(mysql);
-  else
-    return mysql_store_result(mysql);
+  return mysql_store_result(mysql);

Change-Id: I2dd490cc438f521c85a03d8ccffc3bce99cc6ddc

Author: MRajcic

client/completion_hash.cc

@@ -156,10 +156,9 @@ Bucket *find_all_matches(HashTable *ht, const char *str, uint length,
   if (!b) {
     *res_length = 0;
     return (Bucket *)nullptr;
-  } else {
-    *res_length = length;
-    return b;
   }
+  *res_length = length;
+  return b;
 }
 
 Bucket *find_longest_match(HashTable *ht, char *str, uint length,

client/mysql_config_editor.cc

@@ -895,10 +895,9 @@ static void remove_option(DYNAMIC_STRING *file_buf, const char *path_name,
       }
       option_found = true;
       break;
-    } else {
-      /* Move to next line. */
-      while ((--search_len > 1) && (*(++start) != '\n')) {
-      }
+    }
+    /* Move to next line. */
+    while ((--search_len > 1) && (*(++start) != '\n')) {
     }
   }
 

client/mysql_secure_installation.cc

@@ -262,7 +262,7 @@ static void execute_query_with_message(const char *query,
 static bool execute_query(const char **query, size_t length) {
   if (!mysql_real_query(&mysql_handle, (const char *)*query, (ulong)length))
     return false;
-  else if (mysql_errno(&mysql_handle) == CR_SERVER_GONE_ERROR) {
+  if (mysql_errno(&mysql_handle) == CR_SERVER_GONE_ERROR) {
     fprintf(stdout, " ... Failed! Error: %s\n", mysql_error(&mysql_handle));
     free_resources();
     exit(1);
@@ -537,8 +537,8 @@ static void set_opt_user_password(int component_set) {
       if (!execute_query(&query_const, (unsigned int)(end - query))) {
         my_free(query);
         break;
-      } else
-        fprintf(stdout, " ... Failed! Error: %s\n", mysql_error(&mysql_handle));
+      }
+      fprintf(stdout, " ... Failed! Error: %s\n", mysql_error(&mysql_handle));
     }
   }
 }

client/mysqladmin.cc

@@ -1001,7 +1001,8 @@ static int execute_commands(MYSQL *mysql, int argc, char **argv) {
           my_printf_error(0, "Too few arguments to change password",
                           error_flags);
           return 1;
-        } else if (argc == 1) {
+        }
+        if (argc == 1) {
           /* prompt for password */
           typed_password = get_tty_password("New password: ");
           verified = get_tty_password("Confirm new password: ");

client/mysqldump.cc

@@ -3178,8 +3178,8 @@ static uint get_table_structure(const char *table, char *db, char *table_type,
           my_free(scv_buff);
 
           return 0;
-        } else
-          my_free(scv_buff);
+        }
+        my_free(scv_buff);
 
         n_cols = mysql_num_rows(result);
         if (0 != n_cols) {
@@ -5414,29 +5414,29 @@ static int do_show_binary_log_status(MYSQL *mysql_con) {
           mysql_con, &source,
           get_compatible_rpl_source_query("SHOW BINARY LOG STATUS").c_str())) {
     return 1;
-  } else {
-    row = mysql_fetch_row(source);
-    if (row && row[0] && row[1]) {
-      /* SHOW BINARY LOG STATUS reports file and position */
-      print_comment(md_result_file, false,
-                    "\n--\n-- Position to start replication or point-in-time "
-                    "recovery from\n--\n\n");
-      fprintf(
-          md_result_file, "%s%s %s='%s', %s=%s;\n", comment_prefix,
-          get_compatible_rpl_replica_command("CHANGE REPLICATION SOURCE TO")
-              .c_str(),
-          get_compatible_rpl_replica_command("SOURCE_LOG_FILE").c_str(), row[0],
-          get_compatible_rpl_replica_command("SOURCE_LOG_POS").c_str(), row[1]);
-      check_io(md_result_file);
-    } else if (!opt_force) {
-      /* SHOW BINARY LOG STATUS reports nothing and --force is not enabled */
-      my_printf_error(0, "Error: Binlogging on server not active", MYF(0));
-      mysql_free_result(source);
-      maybe_exit(EX_MYSQLERR);
-      return 1;
-    }
+  }
+  row = mysql_fetch_row(source);
+  if (row && row[0] && row[1]) {
+    /* SHOW BINARY LOG STATUS reports file and position */
+    print_comment(md_result_file, false,
+                  "\n--\n-- Position to start replication or point-in-time "
+                  "recovery from\n--\n\n");
+    fprintf(
+        md_result_file, "%s%s %s='%s', %s=%s;\n", comment_prefix,
+        get_compatible_rpl_replica_command("CHANGE REPLICATION SOURCE TO")
+            .c_str(),
+        get_compatible_rpl_replica_command("SOURCE_LOG_FILE").c_str(), row[0],
+        get_compatible_rpl_replica_command("SOURCE_LOG_POS").c_str(), row[1]);
+    check_io(md_result_file);
+  } else if (!opt_force) {
+    /* SHOW BINARY LOG STATUS reports nothing and --force is not enabled */
+    my_printf_error(0, "Error: Binlogging on server not active", MYF(0));
     mysql_free_result(source);
+    maybe_exit(EX_MYSQLERR);
+    return 1;
   }
+  mysql_free_result(source);
+
   return 0;
 }
 

client/mysqlshow.cc

@@ -426,10 +426,8 @@ static int list_dbs(MYSQL *mysql, const char *wild) {
     row = mysql_fetch_row(result);
     if (!my_strcasecmp(&my_charset_latin1, row[0], wild)) {
       mysql_free_result(result);
-      if (opt_status)
-        return list_table_status(mysql, wild, nullptr);
-      else
-        return list_tables(mysql, wild, nullptr);
+      if (opt_status) return list_table_status(mysql, wild, nullptr);
+      return list_tables(mysql, wild, nullptr);
     }
   }
 

client/mysqltest.cc

@@ -370,10 +370,8 @@ const char *get_filename_from_path(const char *path) {
     fname = strrchr(path, '\\');
   else
     fname = strrchr(path, '/');
-  if (fname == nullptr)
-    return path;
-  else
-    return ++fname;
+  if (fname == nullptr) return path;
+  return ++fname;
 }
 
 static uint opt_protocol = 0;
@@ -828,12 +826,9 @@ static int async_mysql_next_result_wrapper(MYSQL *mysql) {
     const int result = socket_event_listen(mysql_get_socket_descriptor(mysql));
     if (result == -1) return 1;
   }
-  if (status == NET_ASYNC_ERROR)
-    return 1;
-  else if (status == NET_ASYNC_COMPLETE_NO_MORE_RESULTS)
-    return -1;
-  else
-    return 0;
+  if (status == NET_ASYNC_ERROR) return 1;
+  if (status == NET_ASYNC_COMPLETE_NO_MORE_RESULTS) return -1;
+  return 0;
 }
 
 static MYSQL *async_mysql_real_connect_wrapper(
@@ -847,10 +842,8 @@ static MYSQL *async_mysql_real_connect_wrapper(
          NET_ASYNC_NOT_READY) {
     t.check();
   }
-  if (status == NET_ASYNC_ERROR)
-    return nullptr;
-  else
-    return mysql;
+  if (status == NET_ASYNC_ERROR) return nullptr;
+  return mysql;
 }
 
 static int async_mysql_query_wrapper(MYSQL *mysql, const char *query) {
@@ -885,17 +878,13 @@ static void async_mysql_free_result_wrapper(MYSQL_RES *result) {
   --async-client option is set or not.
 */
 static MYSQL_ROW mysql_fetch_row_wrapper(MYSQL_RES *res) {
-  if (enable_async_client)
-    return async_mysql_fetch_row_wrapper(res);
-  else
-    return mysql_fetch_row(res);
+  if (enable_async_client) return async_mysql_fetch_row_wrapper(res);
+  return mysql_fetch_row(res);
 }
 
 static MYSQL_RES *mysql_store_result_wrapper(MYSQL *mysql) {
-  if (enable_async_client)
-    return async_mysql_store_result_wrapper(mysql);
-  else
-    return mysql_store_result(mysql);
+  if (enable_async_client) return async_mysql_store_result_wrapper(mysql);
+  return mysql_store_result(mysql);
 }
 
 static int mysql_real_query_wrapper(MYSQL *mysql, const char *query,
@@ -905,8 +894,7 @@ static int mysql_real_query_wrapper(MYSQL *mysql, const char *query,
 
   if (enable_async_client)
     return async_mysql_real_query_wrapper(mysql, query, length);
-  else
-    return mysql_real_query(mysql, query, length);
+  return mysql_real_query(mysql, query, length);
 }
 
 static int mysql_send_query_wrapper(MYSQL *mysql, const char *query,
@@ -916,8 +904,7 @@ static int mysql_send_query_wrapper(MYSQL *mysql, const char *query,
 
   if (enable_async_client)
     return async_mysql_send_query_wrapper(mysql, query, length);
-  else
-    return mysql_send_query(mysql, query, length);
+  return mysql_send_query(mysql, query, length);
 }
 
 static bool mysql_read_query_result_wrapper(MYSQL *mysql) {
@@ -933,17 +920,13 @@ static int mysql_query_wrapper(MYSQL *mysql, const char *query) {
   int rc;
   if (0 != (rc = global_attrs->set_params(mysql))) return rc;
 
-  if (enable_async_client)
-    return async_mysql_query_wrapper(mysql, query);
-  else
-    return mysql_query(mysql, query);
+  if (enable_async_client) return async_mysql_query_wrapper(mysql, query);
+  return mysql_query(mysql, query);
 }
 
 static int mysql_next_result_wrapper(MYSQL *mysql) {
-  if (enable_async_client)
-    return async_mysql_next_result_wrapper(mysql);
-  else
-    return mysql_next_result(mysql);
+  if (enable_async_client) return async_mysql_next_result_wrapper(mysql);
+  return mysql_next_result(mysql);
 }
 
 static MYSQL *mysql_real_connect_wrapper(MYSQL *mysql, const char *host,
@@ -954,16 +937,13 @@ static MYSQL *mysql_real_connect_wrapper(MYSQL *mysql, const char *host,
   if (enable_async_client)
     return async_mysql_real_connect_wrapper(mysql, host, user, passwd, db, port,
                                             unix_socket, client_flag);
-  else
-    return mysql_real_connect(mysql, host, user, passwd, db, port, unix_socket,
-                              client_flag);
+  return mysql_real_connect(mysql, host, user, passwd, db, port, unix_socket,
+                            client_flag);
 }
 
 static void mysql_free_result_wrapper(MYSQL_RES *result) {
-  if (enable_async_client)
-    return async_mysql_free_result_wrapper(result);
-  else
-    return mysql_free_result(result);
+  if (enable_async_client) return async_mysql_free_result_wrapper(result);
+  return mysql_free_result(result);
 }
 
 /* async client test code (end) */
@@ -5294,30 +5274,18 @@ static void check_variable_name(const char *var_name, const char *var_name_end,
   op - character pointer to mathematical expression
 */
 static bool is_operator(const char *op) {
-  if (*op == '+')
-    return true;
-  else if (*op == '-')
-    return true;
-  else if (*op == '*')
-    return true;
-  else if (*op == '/')
-    return true;
-  else if (*op == '%')
-    return true;
-  else if (*op == '&' && *(op + 1) == '&')
-    return true;
-  else if (*op == '|' && *(op + 1) == '|')
-    return true;
-  else if (*op == '&')
-    return true;
-  else if (*op == '|')
-    return true;
-  else if (*op == '^')
-    return true;
-  else if (*op == '>' && *(op + 1) == '>')
-    return true;
-  else if (*op == '<' && *(op + 1) == '<')
-    return true;
+  if (*op == '+') return true;
+  if (*op == '-') return true;
+  if (*op == '*') return true;
+  if (*op == '/') return true;
+  if (*op == '%') return true;
+  if (*op == '&' && *(op + 1) == '&') return true;
+  if (*op == '|' && *(op + 1) == '|') return true;
+  if (*op == '&') return true;
+  if (*op == '|') return true;
+  if (*op == '^') return true;
+  if (*op == '>' && *(op + 1) == '>') return true;
+  if (*op == '<' && *(op + 1) == '<') return true;
 
   return false;
 }
@@ -6141,18 +6109,17 @@ static void do_disable_warnings(struct st_command *command) {
     // Set 'disable_warnings' property value to 1
     set_property(command, P_WARN, true);
     return;
-  } else {
-    // Parse the warning list argument specified with disable_warnings
-    // command.
-    parse_warning_list_argument(command);
+  }
+  // Parse the warning list argument specified with disable_warnings
+  // command.
+  parse_warning_list_argument(command);
 
-    // Update the environment variables containing the list of disabled
-    // and enabled warnings.
-    update_disabled_enabled_warnings_list_var();
+  // Update the environment variables containing the list of disabled
+  // and enabled warnings.
+  update_disabled_enabled_warnings_list_var();
 
-    // Set 'disable_warnings' property value to 1
-    set_property(command, P_WARN, true);
-  }
+  // Set 'disable_warnings' property value to 1
+  set_property(command, P_WARN, true);
 
   command->last_argument = command->end;
 }
@@ -10920,10 +10887,8 @@ static struct st_replace_regex *init_replace_regex(const char *expr) {
     }
 
     if (p == expr_end || ++p == expr_end) {
-      if (!res->regex_arr.empty())
-        break;
-      else
-        goto err;
+      if (!res->regex_arr.empty()) break;
+      goto err;
     }
     /* we found the start */
     reg.pattern = buf_p;

client/mysqltest/regular_expressions.cc

@@ -258,7 +258,6 @@ int search_protocol_re(std::regex *re, const char *str) {
 
     // Match found
     return 1;
-  } else {
-    return 0;
   }
+  return 0;
 }

client/path.cc

@@ -145,14 +145,13 @@ bool Path::exists() {
     if (dir == nullptr) return false;
     my_dirend(dir);
     return true;
-  } else {
-    MY_STAT s;
-    std::string qpath(m_path);
-    qpath.append(FN_DIRSEP).append(m_filename);
-    if (my_stat(qpath.c_str(), &s, MYF(0)) == nullptr) return false;
-    if (!MY_S_ISREG(s.st_mode)) return false;
-    return true;
   }
+  MY_STAT s;
+  std::string qpath(m_path);
+  qpath.append(FN_DIRSEP).append(m_filename);
+  if (my_stat(qpath.c_str(), &s, MYF(0)) == nullptr) return false;
+  if (!MY_S_ISREG(s.st_mode)) return false;
+  return true;
 }
 
 std::string Path::to_str() {

components/example/test_string_service_long.cc

@@ -70,11 +70,11 @@ mysql_service_status_t test_string_service_init() {
   if (!(test_text = (char *)malloc(MAX_BUFFER_LENGTH + 1))) {
     WRITE_LOG("%s\n", "Allcoate buffer failed. Stopped test execution.");
     return (true);
-  } else {
-    for (int i = 0; i < MAX_BUFFER_LENGTH / TEST_TEXT_LIT_LENGTH; i++) {
-      strcpy(&test_text[i * TEST_TEXT_LIT_LENGTH], test_text_lit);
-    }
   }
+  for (int i = 0; i < MAX_BUFFER_LENGTH / TEST_TEXT_LIT_LENGTH; i++) {
+    strcpy(&test_text[i * TEST_TEXT_LIT_LENGTH], test_text_lit);
+  }
+
   WRITE_LOG("%s\n", test_text);
 
   if (mysql_service_mysql_string_factory->create(&out_string)) {