diff options
29 files changed, 110 insertions, 242 deletions
diff --git a/storage/innobase/btr/btr0pcur.cc b/storage/innobase/btr/btr0pcur.cc index 943ae996f20..4bc932b18a7 100644 --- a/storage/innobase/btr/btr0pcur.cc +++ b/storage/innobase/btr/btr0pcur.cc @@ -216,15 +216,15 @@ btr_pcur_copy_stored_position( copied */ { ut_free(pcur_receive->old_rec_buf); - ut_memcpy(pcur_receive, pcur_donate, sizeof(btr_pcur_t)); + memcpy(pcur_receive, pcur_donate, sizeof(btr_pcur_t)); if (pcur_donate->old_rec_buf) { pcur_receive->old_rec_buf = (byte*) ut_malloc_nokey(pcur_donate->buf_size); - ut_memcpy(pcur_receive->old_rec_buf, pcur_donate->old_rec_buf, - pcur_donate->buf_size); + memcpy(pcur_receive->old_rec_buf, pcur_donate->old_rec_buf, + pcur_donate->buf_size); pcur_receive->old_rec = pcur_receive->old_rec_buf + (pcur_donate->old_rec - pcur_donate->old_rec_buf); } diff --git a/storage/innobase/dict/dict0crea.cc b/storage/innobase/dict/dict0crea.cc index 24662eed8af..def439034dc 100644 --- a/storage/innobase/dict/dict0crea.cc +++ b/storage/innobase/dict/dict0crea.cc @@ -228,7 +228,7 @@ dict_create_sys_columns_tuple( col_name = dict_table_get_col_name(table, i); } - dfield_set_data(dfield, col_name, ut_strlen(col_name)); + dfield_set_data(dfield, col_name, strlen(col_name)); /* 5: MTYPE --------------------------*/ dfield = dtuple_get_nth_field(entry, DICT_COL__SYS_COLUMNS__MTYPE); @@ -651,8 +651,7 @@ dict_create_sys_fields_tuple( /* 4: COL_NAME -------------------------*/ dfield = dtuple_get_nth_field(entry, DICT_COL__SYS_FIELDS__COL_NAME); - dfield_set_data(dfield, field->name, - ut_strlen(field->name)); + dfield_set_data(dfield, field->name, strlen(field->name)); /*---------------------------------*/ return(entry); diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc index 210139b4626..f81096989d7 100644 --- a/storage/innobase/dict/dict0dict.cc +++ b/storage/innobase/dict/dict0dict.cc @@ -1264,7 +1264,7 @@ dict_table_rename_in_cache( dict_table_t* table2; HASH_SEARCH(name_hash, dict_sys.table_hash, fold, dict_table_t*, table2, ut_ad(table2->cached), - (ut_strcmp(table2->name.m_name, new_name) == 0)); + (strcmp(table2->name.m_name, new_name) == 0)); DBUG_EXECUTE_IF("dict_table_rename_in_cache_failure", if (table2 == NULL) { table2 = (dict_table_t*) -1; @@ -1428,8 +1428,8 @@ dict_table_rename_in_cache( foreign->referenced_table->referenced_set.erase(foreign); } - if (ut_strlen(foreign->foreign_table_name) - < ut_strlen(table->name.m_name)) { + if (strlen(foreign->foreign_table_name) + < strlen(table->name.m_name)) { /* Allocate a longer name buffer; TODO: store buf len to save memory */ @@ -1505,11 +1505,11 @@ dict_table_rename_in_cache( old_id = mem_strdup(foreign->id); - if (ut_strlen(fkid) > ut_strlen(old_name_cs_filename) + if (strlen(fkid) > strlen(old_name_cs_filename) + ((sizeof dict_ibfk) - 1) && !memcmp(fkid, old_name_cs_filename, - ut_strlen(old_name_cs_filename)) - && !memcmp(fkid + ut_strlen(old_name_cs_filename), + strlen(old_name_cs_filename)) + && !memcmp(fkid + strlen(old_name_cs_filename), dict_ibfk, (sizeof dict_ibfk) - 1)) { /* This is a generated >= 4.0.18 format id */ @@ -1550,7 +1550,7 @@ dict_table_rename_in_cache( strcpy(foreign->id, table_name); if (on_tmp) { strcat(foreign->id, - old_id + ut_strlen(old_name)); + old_id + strlen(old_name)); } else { sprintf(strchr(foreign->id, '/') + 1, "%s%s", @@ -1576,8 +1576,8 @@ dict_table_rename_in_cache( /* Replace the database prefix in id with the one from table->name */ - ut_memcpy(foreign->id, - table->name.m_name, db_len); + memcpy(foreign->id, + table->name.m_name, db_len); strcpy(foreign->id + db_len, dict_remove_db_name(old_id)); @@ -1603,8 +1603,8 @@ dict_table_rename_in_cache( foreign = *it; - if (ut_strlen(foreign->referenced_table_name) - < ut_strlen(table->name.m_name)) { + if (strlen(foreign->referenced_table_name) + < strlen(table->name.m_name)) { /* Allocate a longer name buffer; TODO: store buf len to save memory */ @@ -3159,7 +3159,7 @@ dict_accept( *success = TRUE; - return(ptr + ut_strlen(string)); + return ptr + strlen(string); } /*********************************************************************//** @@ -3644,7 +3644,7 @@ dict_table_get_highest_foreign_id( ut_a(table); - len = ut_strlen(table->name.m_name); + len = strlen(table->name.m_name); for (dict_foreign_set::iterator it = table->foreign_set.begin(); it != table->foreign_set.end(); @@ -3660,10 +3660,10 @@ dict_table_get_highest_foreign_id( strchr(foreign->id, '/') + 1, MAX_TABLE_NAME_LEN); - if (ut_strlen(fkid) > ((sizeof dict_ibfk) - 1) + len - && 0 == ut_memcmp(fkid, table->name.m_name, len) - && 0 == ut_memcmp(fkid + len, - dict_ibfk, (sizeof dict_ibfk) - 1) + if (strlen(fkid) > ((sizeof dict_ibfk) - 1) + len + && 0 == memcmp(fkid, table->name.m_name, len) + && 0 == memcmp(fkid + len, + dict_ibfk, (sizeof dict_ibfk) - 1) && fkid[len + ((sizeof dict_ibfk) - 1)] != '0') { /* It is of the >= 4.0.18 format */ @@ -4275,7 +4275,7 @@ col_loop1: foreign->id = static_cast<char*>(mem_heap_alloc( foreign->heap, db_len + strlen(constraint_name) + 2)); - ut_memcpy(foreign->id, table->name.m_name, db_len); + memcpy(foreign->id, table->name.m_name, db_len); foreign->id[db_len] = '/'; strcpy(foreign->id + db_len + 1, constraint_name); } @@ -6489,8 +6489,7 @@ dict_space_get_id( ut_ad(len > 0); ut_ad(len < OS_FILE_MAX_PATH); - if (len == name_len && ut_memcmp(name, field, len) == 0) { - + if (len == name_len && !memcmp(name, field, len)) { field = rec_get_nth_field_old( rec, DICT_FLD__SYS_TABLESPACES__SPACE, &len); ut_ad(len == 4); diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc index 42478e18f84..fcaf4b0ab3b 100644 --- a/storage/innobase/dict/dict0load.cc +++ b/storage/innobase/dict/dict0load.cc @@ -234,7 +234,7 @@ dict_get_first_table_name_in_db( tuple = dtuple_create(heap, 1); dfield = dtuple_get_nth_field(tuple, 0); - dfield_set_data(dfield, name, ut_strlen(name)); + dfield_set_data(dfield, name, strlen(name)); dict_index_copy_types(tuple, sys_index, 1); btr_pcur_open_on_user_rec(sys_index, tuple, PAGE_CUR_GE, @@ -256,7 +256,7 @@ loop: rec, DICT_FLD__SYS_TABLES__NAME, &len); if (len < strlen(name) - || ut_memcmp(name, field, strlen(name)) != 0) { + || memcmp(name, field, strlen(name))) { /* Not found */ btr_pcur_close(&pcur); @@ -2892,7 +2892,7 @@ dict_load_table_one( tuple = dtuple_create(heap, 1); dfield = dtuple_get_nth_field(tuple, 0); - dfield_set_data(dfield, name.m_name, ut_strlen(name.m_name)); + dfield_set_data(dfield, name.m_name, strlen(name.m_name)); dict_index_copy_types(tuple, sys_index, 1); btr_pcur_open_on_user_rec(sys_index, tuple, PAGE_CUR_GE, @@ -2914,8 +2914,8 @@ err_exit: rec, DICT_FLD__SYS_TABLES__NAME, &len); /* Check if the table name in record is the searched one */ - if (len != ut_strlen(name.m_name) - || 0 != ut_memcmp(name.m_name, field, len)) { + if (len != strlen(name.m_name) + || memcmp(name.m_name, field, len)) { goto err_exit; } @@ -3271,7 +3271,7 @@ dict_load_foreign_cols( field = rec_get_nth_field_old( rec, DICT_FLD__SYS_FOREIGN_COLS__ID, &len); - if (len != id_len || ut_memcmp(foreign->id, field, len) != 0) { + if (len != id_len || memcmp(foreign->id, field, len)) { const rec_t* pos; ulint pos_len; const rec_t* for_col_name; @@ -3422,8 +3422,7 @@ dict_load_foreign( field = rec_get_nth_field_old(rec, DICT_FLD__SYS_FOREIGN__ID, &len); /* Check if the id in record is the searched one */ - if (len != id_len || ut_memcmp(id, field, len) != 0) { - + if (len != id_len || memcmp(id, field, len)) { { ib::error err; err << "Cannot load foreign constraint " << id @@ -3582,7 +3581,7 @@ start_load: tuple = dtuple_create_from_mem(tuple_buf, sizeof(tuple_buf), 1, 0); dfield = dtuple_get_nth_field(tuple, 0); - dfield_set_data(dfield, table_name, ut_strlen(table_name)); + dfield_set_data(dfield, table_name, strlen(table_name)); dict_index_copy_types(tuple, sec_index, 1); btr_pcur_open_on_user_rec(sec_index, tuple, PAGE_CUR_GE, @@ -3627,8 +3626,8 @@ loop: goto next_rec; } - if ((innobase_get_lower_case_table_names() != 2) - && (0 != ut_memcmp(field, table_name, len))) { + if (innobase_get_lower_case_table_names() != 2 + && memcmp(field, table_name, len)) { goto next_rec; } diff --git a/storage/innobase/eval/eval0eval.cc b/storage/innobase/eval/eval0eval.cc index 577157d2eb9..de68915aa3b 100644 --- a/storage/innobase/eval/eval0eval.cc +++ b/storage/innobase/eval/eval0eval.cc @@ -442,10 +442,8 @@ eval_notfound( ut_ad(que_node_get_type(cursor) == QUE_NODE_SYMBOL); if (cursor->token_type == SYM_LIT) { - - ut_ad(ut_memcmp(dfield_get_data(que_node_get_val(cursor)), - "SQL", 3) == 0); - + ut_ad(!memcmp(dfield_get_data(que_node_get_val(cursor)), + "SQL", 3)); sel_node = cursor->sym_table->query_graph->last_sel_node; } else { sel_node = cursor->alias->cursor_def; @@ -530,7 +528,7 @@ eval_replstr( ut_error; } - ut_memcpy(str1 + len1, str2, len2); + memcpy(str1 + len1, str2, len2); } /*****************************************************************//** @@ -637,7 +635,7 @@ eval_binary_to_number( int_val = 0; str2 = (byte*) &int_val; - ut_memcpy(str2 + (4 - len1), str1, len1); + memcpy(str2 + (4 - len1), str1, len1); } eval_node_copy_and_alloc_val(func_node, str2, 4); @@ -677,7 +675,7 @@ eval_concat( dfield = que_node_get_val(arg); len1 = dfield_get_len(dfield); - ut_memcpy(data + len, dfield_get_data(dfield), len1); + memcpy(data + len, dfield_get_data(dfield), len1); len += len1; diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc index adeda4c9487..c248726913a 100644 --- a/storage/innobase/fts/fts0fts.cc +++ b/storage/innobase/fts/fts0fts.cc @@ -371,7 +371,7 @@ fts_load_default_stopword( new_word.nodes = ib_vector_create( allocator, sizeof(fts_node_t), 4); - str.f_len = ut_strlen(word); + str.f_len = strlen(word); str.f_str = reinterpret_cast<byte*>(word); fts_string_dup(&new_word.text, &str, heap); @@ -5717,7 +5717,7 @@ fts_is_aux_table_name( char my_name[MAX_FULL_NAME_LEN + 1]; ut_ad(len <= MAX_FULL_NAME_LEN); - ut_memcpy(my_name, name, len); + memcpy(my_name, name, len); my_name[len] = 0; end = my_name + len; @@ -7036,11 +7036,7 @@ fts_valid_stopword_table( return(NULL); } else { - const char* col_name; - - col_name = dict_table_get_col_name(table, 0); - - if (ut_strcmp(col_name, "value")) { + if (strcmp(dict_table_get_col_name(table, 0), "value")) { ib::error() << "Invalid column name for stopword" " table " << stopword_table_name << ". Its" " first column must be named as 'value'."; @@ -7167,7 +7163,7 @@ fts_load_stopword( if (!reload) { str.f_n_char = 0; str.f_str = (byte*) stopword_to_use; - str.f_len = ut_strlen(stopword_to_use); + str.f_len = strlen(stopword_to_use); error = fts_config_set_value( trx, &fts_table, FTS_STOPWORD_TABLE_NAME, &str); diff --git a/storage/innobase/fts/fts0que.cc b/storage/innobase/fts/fts0que.cc index 829cfc72ec6..f64e146c030 100644 --- a/storage/innobase/fts/fts0que.cc +++ b/storage/innobase/fts/fts0que.cc @@ -599,7 +599,7 @@ fts_ranking_words_add( ranking->words = static_cast<byte*>( mem_heap_zalloc(query->heap, words_len)); - ut_memcpy(ranking->words, words, ranking->words_len); + memcpy(ranking->words, words, ranking->words_len); ranking->words_len = words_len; } diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 226c6231b05..2e5b3c50a87 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -14661,7 +14661,7 @@ get_foreign_key_info( /* Referenced (parent) database name */ len = dict_get_db_name_len(foreign->referenced_table_name); ut_a(len < sizeof(tmp_buff)); - ut_memcpy(tmp_buff, foreign->referenced_table_name, len); + memcpy(tmp_buff, foreign->referenced_table_name, len); tmp_buff[len] = 0; len = filename_to_tablename(tmp_buff, name_buff, sizeof(name_buff)); @@ -14677,7 +14677,7 @@ get_foreign_key_info( /* Dependent (child) database name */ len = dict_get_db_name_len(foreign->foreign_table_name); ut_a(len < sizeof(tmp_buff)); - ut_memcpy(tmp_buff, foreign->foreign_table_name, len); + memcpy(tmp_buff, foreign->foreign_table_name, len); tmp_buff[len] = 0; len = filename_to_tablename(tmp_buff, name_buff, sizeof(name_buff)); diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 13d606bcc34..cffbf692fe7 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -555,8 +555,9 @@ inline bool dict_table_t::instant_column(const dict_table_t& table, DBUG_ASSERT(c.is_added()); if (c.def_val.len <= sizeof field_ref_zero - && !memcmp(c.def_val.data, field_ref_zero, - c.def_val.len)) { + && (!c.def_val.len + || !memcmp(c.def_val.data, field_ref_zero, + c.def_val.len))) { c.def_val.data = field_ref_zero; } else if (const void*& d = c.def_val.data) { d = mem_heap_dup(heap, d, c.def_val.len); @@ -2553,7 +2554,7 @@ innobase_init_foreign( foreign->id = static_cast<char*>(mem_heap_alloc( foreign->heap, db_len + strlen(constraint_name) + 2)); - ut_memcpy(foreign->id, table->name.m_name, db_len); + memcpy(foreign->id, table->name.m_name, db_len); foreign->id[db_len] = '/'; strcpy(foreign->id + db_len + 1, constraint_name); @@ -3600,8 +3601,8 @@ innobase_create_index_def( if (key->flags & HA_USES_PARSER) { for (ulint j = 0; j < altered_table->s->keys; j++) { - if (ut_strcmp(altered_table->key_info[j].name.str, - key->name.str) == 0) { + if (!strcmp(altered_table->key_info[j].name.str, + key->name.str)) { ut_ad(altered_table->key_info[j].flags & HA_USES_PARSER); @@ -11206,7 +11207,7 @@ foreign_fail: #endif /* BTR_CUR_HASH_ADAPT */ char tb_name[FN_REFLEN]; - ut_strcpy(tb_name, m_prebuilt->table->name.m_name); + strcpy(tb_name, m_prebuilt->table->name.m_name); tb_name[strlen(m_prebuilt->table->name.m_name)] = 0; diff --git a/storage/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic index 699b3ee8407..7f3f036e34c 100644 --- a/storage/innobase/include/buf0buf.ic +++ b/storage/innobase/include/buf0buf.ic @@ -859,7 +859,7 @@ buf_frame_copy( { ut_ad(buf && frame); - ut_memcpy(buf, frame, srv_page_size); + memcpy(buf, frame, srv_page_size); return(buf); } diff --git a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h index e72b24da9f5..336834cda95 100644 --- a/storage/innobase/include/dict0mem.h +++ b/storage/innobase/include/dict0mem.h @@ -1331,7 +1331,7 @@ struct dict_foreign_compare { const dict_foreign_t* lhs, const dict_foreign_t* rhs) const { - return(ut_strcmp(lhs->id, rhs->id) < 0); + return strcmp(lhs->id, rhs->id) < 0; } }; diff --git a/storage/innobase/include/eval0eval.ic b/storage/innobase/include/eval0eval.ic index ae0887408b0..0ea4057fdad 100644 --- a/storage/innobase/include/eval0eval.ic +++ b/storage/innobase/include/eval0eval.ic @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -230,7 +231,7 @@ eval_node_copy_and_alloc_val( data = eval_node_ensure_val_buf(node, len); - ut_memcpy(data, str, len); + memcpy(data, str, len); } /*****************************************************************//** diff --git a/storage/innobase/include/rem0rec.ic b/storage/innobase/include/rem0rec.ic index 9196b15f86c..50956310838 100644 --- a/storage/innobase/include/rem0rec.ic +++ b/storage/innobase/include/rem0rec.ic @@ -1188,7 +1188,7 @@ rec_set_nth_field( ut_ad(len2 == len); } - ut_memcpy(data2, data, len); + memcpy(data2, data, len); } /**********************************************************//** @@ -1331,7 +1331,7 @@ rec_copy( extra_len = rec_offs_extra_size(offsets); data_len = rec_offs_data_size(offsets); - ut_memcpy(buf, rec - extra_len, extra_len + data_len); + memcpy(buf, rec - extra_len, extra_len + data_len); return((byte*) buf + extra_len); } diff --git a/storage/innobase/include/ut0mem.h b/storage/innobase/include/ut0mem.h index 49777495cae..1a430e98a10 100644 --- a/storage/innobase/include/ut0mem.h +++ b/storage/innobase/include/ut0mem.h @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -29,60 +30,6 @@ Created 5/30/1994 Heikki Tuuri #include "os0event.h" #include "ut0mutex.h" -/** Wrapper for memcpy(3). Copy memory area when the source and -target are not overlapping. -@param[in,out] dest copy to -@param[in] src copy from -@param[in] n number of bytes to copy -@return dest */ -UNIV_INLINE -void* -ut_memcpy(void* dest, const void* src, ulint n); - -/** Wrapper for memmove(3). Copy memory area when the source and -target are overlapping. -@param[in,out] dest Move to -@param[in] src Move from -@param[in] n number of bytes to move -@return dest */ -UNIV_INLINE -void* -ut_memmove(void* dest, const void* sour, ulint n); - -/** Wrapper for memcmp(3). Compare memory areas. -@param[in] str1 first memory block to compare -@param[in] str2 second memory block to compare -@param[in] n number of bytes to compare -@return negative, 0, or positive if str1 is smaller, equal, - or greater than str2, respectively. */ -UNIV_INLINE -int -ut_memcmp(const void* str1, const void* str2, ulint n); - -/** Wrapper for strcpy(3). Copy a NUL-terminated string. -@param[in,out] dest Destination to copy to -@param[in] src Source to copy from -@return dest */ -UNIV_INLINE -char* -ut_strcpy(char* dest, const char* src); - -/** Wrapper for strlen(3). Determine the length of a NUL-terminated string. -@param[in] str string -@return length of the string in bytes, excluding the terminating NUL */ -UNIV_INLINE -ulint -ut_strlen(const char* str); - -/** Wrapper for strcmp(3). Compare NUL-terminated strings. -@param[in] str1 first string to compare -@param[in] str2 second string to compare -@return negative, 0, or positive if str1 is smaller, equal, - or greater than str2, respectively. */ -UNIV_INLINE -int -ut_strcmp(const char* str1, const char* str2); - /**********************************************************************//** Copies up to size - 1 characters from the NUL-terminated string src to dst, NUL-terminating the result. Returns strlen(src), so truncation diff --git a/storage/innobase/include/ut0mem.ic b/storage/innobase/include/ut0mem.ic index 8c8788a38aa..cc95a03642e 100644 --- a/storage/innobase/include/ut0mem.ic +++ b/storage/innobase/include/ut0mem.ic @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2014, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, MariaDB Corporation. +Copyright (c) 2017, 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -27,78 +27,6 @@ Created 5/30/1994 Heikki Tuuri #include "ut0byte.h" #include "mach0data.h" -/** Wrapper for memcpy(3). Copy memory area when the source and -target are not overlapping. -@param[in,out] dest copy to -@param[in] src copy from -@param[in] n number of bytes to copy -@return dest */ -UNIV_INLINE -void* -ut_memcpy(void* dest, const void* src, ulint n) -{ - return(memcpy(dest, src, n)); -} - -/** Wrapper for memmove(3). Copy memory area when the source and -target are overlapping. -@param[in,out] dest Move to -@param[in] src Move from -@param[in] n number of bytes to move -@return dest */ -UNIV_INLINE -void* -ut_memmove(void* dest, const void* src, ulint n) -{ - return(memmove(dest, src, n)); -} - -/** Wrapper for memcmp(3). Compare memory areas. -@param[in] str1 first memory block to compare -@param[in] str2 second memory block to compare -@param[in] n number of bytes to compare -@return negative, 0, or positive if str1 is smaller, equal, - or greater than str2, respectively. */ -UNIV_INLINE -int -ut_memcmp(const void* str1, const void* str2, ulint n) -{ - return(memcmp(str1, str2, n)); -} - -/** Wrapper for strcpy(3). Copy a NUL-terminated string. -@param[in,out] dest Destination to copy to -@param[in] src Source to copy from -@return dest */ -UNIV_INLINE -char* -ut_strcpy(char* dest, const char* src) -{ - return(strcpy(dest, src)); -} - -/** Wrapper for strlen(3). Determine the length of a NUL-terminated string. -@param[in] str string -@return length of the string in bytes, excluding the terminating NUL */ -UNIV_INLINE -ulint -ut_strlen(const char* str) -{ - return(strlen(str)); -} - -/** Wrapper for strcmp(3). Compare NUL-terminated strings. -@param[in] str1 first string to compare -@param[in] str2 second string to compare -@return negative, 0, or positive if str1 is smaller, equal, - or greater than str2, respectively. */ -UNIV_INLINE -int -ut_strcmp(const char* str1, const char* str2) -{ - return(strcmp(str1, str2)); -} - /**********************************************************************//** Converts a raw binary data to a NUL-terminated hex string. The output is truncated if there is not enough space in "hex", make sure "hex_size" is at diff --git a/storage/innobase/lock/lock0prdt.cc b/storage/innobase/lock/lock0prdt.cc index 9827243177d..a6bb8a423f4 100644 --- a/storage/innobase/lock/lock0prdt.cc +++ b/storage/innobase/lock/lock0prdt.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2014, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2018, MariaDB Corporation. +Copyright (c) 2018, 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -775,7 +775,7 @@ lock_init_prdt_from_mbr( if (heap != NULL) { prdt->data = mem_heap_alloc(heap, sizeof(*mbr)); - ut_memcpy(prdt->data, mbr, sizeof(*mbr)); + memcpy(prdt->data, mbr, sizeof(*mbr)); } else { prdt->data = static_cast<void*>(mbr); } diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc index 827ec8eb0cb..1fee4d70411 100644 --- a/storage/innobase/log/log0log.cc +++ b/storage/innobase/log/log0log.cc @@ -832,9 +832,8 @@ log_buffer_switch() } /* Copy the last block to new buf */ - ut_memcpy(log_sys.buf, - old_buf + area_end - OS_FILE_LOG_BLOCK_SIZE, - OS_FILE_LOG_BLOCK_SIZE); + memcpy(log_sys.buf, old_buf + area_end - OS_FILE_LOG_BLOCK_SIZE, + OS_FILE_LOG_BLOCK_SIZE); log_sys.buf_free %= OS_FILE_LOG_BLOCK_SIZE; log_sys.buf_next_to_write = log_sys.buf_free; diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index c40267844a1..082b3ef6d66 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -2879,8 +2879,8 @@ bool recv_sys_add_to_parsing_buf(const byte* log_block, lsn_t scanned_lsn) ut_ad(start_offset <= end_offset); if (start_offset < end_offset) { - ut_memcpy(recv_sys.buf + recv_sys.len, - log_block + start_offset, end_offset - start_offset); + memcpy(recv_sys.buf + recv_sys.len, + log_block + start_offset, end_offset - start_offset); recv_sys.len += end_offset - start_offset; @@ -2893,8 +2893,8 @@ bool recv_sys_add_to_parsing_buf(const byte* log_block, lsn_t scanned_lsn) /** Moves the parsing buffer data left to the buffer start. */ void recv_sys_justify_left_parsing_buf() { - ut_memmove(recv_sys.buf, recv_sys.buf + recv_sys.recovered_offset, - recv_sys.len - recv_sys.recovered_offset); + memmove(recv_sys.buf, recv_sys.buf + recv_sys.recovered_offset, + recv_sys.len - recv_sys.recovered_offset); recv_sys.len -= recv_sys.recovered_offset; diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index 2d04a7cddc9..40d77fa50eb 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -1259,9 +1259,9 @@ os_file_make_data_dir_path( return; } - ulint tablename_len = ut_strlen(tablename); + ulint tablename_len = strlen(tablename); - ut_memmove(++ptr, tablename, tablename_len); + memmove(++ptr, tablename, tablename_len); ptr[tablename_len] = '\0'; } @@ -2715,6 +2715,9 @@ next_file: full_path = static_cast<char*>( ut_malloc_nokey(strlen(dirname) + strlen(ent->d_name) + 10)); + if (!full_path) { + return -1; + } sprintf(full_path, "%s/%s", dirname, ent->d_name); diff --git a/storage/innobase/page/page0cur.cc b/storage/innobase/page/page0cur.cc index 2c69b87cea4..0870b96adc4 100644 --- a/storage/innobase/page/page0cur.cc +++ b/storage/innobase/page/page0cur.cc @@ -1160,8 +1160,8 @@ page_cur_parse_insert_rec( << " parsed len " << (ptr - ptr2); } - ut_memcpy(buf, rec_get_start(cursor_rec, offsets), mismatch_index); - ut_memcpy(buf + mismatch_index, ptr, end_seg_len); + memcpy(buf, rec_get_start(cursor_rec, offsets), mismatch_index); + memcpy(buf + mismatch_index, ptr, end_seg_len); if (page_is_comp(page)) { rec_set_heap_no_new(buf + origin_offset, diff --git a/storage/innobase/pars/lexyy.cc b/storage/innobase/pars/lexyy.cc index 16e7e47069e..0054e1c34d0 100644 --- a/storage/innobase/pars/lexyy.cc +++ b/storage/innobase/pars/lexyy.cc @@ -1977,7 +1977,7 @@ YY_RULE_SETUP { yylval = sym_tab_add_id(pars_sym_tab_global, (byte*) yytext, - ut_strlen(yytext)); + strlen(yytext)); return(PARS_ID_TOKEN); } YY_BREAK @@ -1987,7 +1987,7 @@ YY_RULE_SETUP { yylval = sym_tab_add_id(pars_sym_tab_global, (byte*) yytext, - ut_strlen(yytext)); + strlen(yytext)); return(PARS_TABLE_NAME_TOKEN); } YY_BREAK diff --git a/storage/innobase/pars/pars0lex.l b/storage/innobase/pars/pars0lex.l index 2d0e56f400d..080e6de5120 100644 --- a/storage/innobase/pars/pars0lex.l +++ b/storage/innobase/pars/pars0lex.l @@ -560,14 +560,14 @@ In the state 'id', only two actions are possible (defined below). */ {ID} { yylval = sym_tab_add_id(pars_sym_tab_global, (byte*) yytext, - ut_strlen(yytext)); + strlen(yytext)); return(PARS_ID_TOKEN); } {TABLE_NAME} { yylval = sym_tab_add_id(pars_sym_tab_global, (byte*) yytext, - ut_strlen(yytext)); + strlen(yytext)); return(PARS_TABLE_NAME_TOKEN); } diff --git a/storage/innobase/pars/pars0opt.cc b/storage/innobase/pars/pars0opt.cc index 0cfd93d4120..3730879146d 100644 --- a/storage/innobase/pars/pars0opt.cc +++ b/storage/innobase/pars/pars0opt.cc @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -584,8 +585,8 @@ opt_search_plan_for_table( best_goodness = goodness; n_fields = opt_calc_n_fields_from_goodness(goodness); - ut_memcpy(best_index_plan, index_plan, - n_fields * sizeof(void*)); + memcpy(best_index_plan, index_plan, + n_fields * sizeof *index_plan); best_last_op = last_op; } @@ -609,8 +610,8 @@ opt_search_plan_for_table( pars_sym_tab_global->heap, n_fields * sizeof(void*))); - ut_memcpy(plan->tuple_exps, best_index_plan, - n_fields * sizeof(void*)); + memcpy(plan->tuple_exps, best_index_plan, + n_fields * sizeof *best_index_plan); if (best_last_op == '=' || best_last_op == PARS_LIKE_TOKEN_EXACT || best_last_op == PARS_LIKE_TOKEN_PREFIX diff --git a/storage/innobase/pars/pars0pars.cc b/storage/innobase/pars/pars0pars.cc index 062cb5ae1d2..f9ce3a2ebea 100644 --- a/storage/innobase/pars/pars0pars.cc +++ b/storage/innobase/pars/pars0pars.cc @@ -640,9 +640,8 @@ pars_resolve_exp_variables_and_types( || (node->token_type == SYM_CURSOR) || (node->token_type == SYM_FUNCTION)) && node->name - && (sym_node->name_len == node->name_len) - && (ut_memcmp(sym_node->name, node->name, - node->name_len) == 0)) { + && sym_node->name_len == node->name_len + && !memcmp(sym_node->name, node->name, node->name_len)) { /* Found a variable or a cursor declared with the same name */ @@ -750,9 +749,9 @@ pars_resolve_exp_columns( const char* col_name = dict_table_get_col_name(table, i); - if ((sym_node->name_len == ut_strlen(col_name)) - && (0 == ut_memcmp(sym_node->name, col_name, - sym_node->name_len))) { + if (sym_node->name_len == strlen(col_name) + && !memcmp(sym_node->name, col_name, + sym_node->name_len)) { /* Found */ sym_node->resolved = TRUE; sym_node->token_type = SYM_COLUMN; @@ -871,7 +870,7 @@ pars_select_all_columns( col_node = sym_tab_add_id(pars_sym_tab_global, (byte*) col_name, - ut_strlen(col_name)); + strlen(col_name)); select_node->select_list = que_node_list_add_last( select_node->select_list, col_node); diff --git a/storage/innobase/rem/rem0rec.cc b/storage/innobase/rem/rem0rec.cc index 1f0f661448c..e6b0792c62c 100644 --- a/storage/innobase/rem/rem0rec.cc +++ b/storage/innobase/rem/rem0rec.cc @@ -1939,7 +1939,7 @@ rec_copy_prefix_to_buf_old( *buf = static_cast<byte*>(ut_malloc_nokey(prefix_len)); } - ut_memcpy(*buf, rec - area_start, prefix_len); + memcpy(*buf, rec - area_start, prefix_len); copy_rec = *buf + area_start; @@ -2745,7 +2745,7 @@ wsrep_rec_get_foreign_key( } data++; } - + if (!(col_f->prtype & DATA_UNSIGNED)) { buf[len-1] = (byte) (buf[len-1] ^ 128); } @@ -2757,7 +2757,7 @@ wsrep_rec_get_foreign_key( case DATA_CHAR: case DATA_MYSQL: /* Copy the actual data */ - ut_memcpy(buf, data, len); + memcpy(buf, data, len); len = wsrep_innobase_mysql_sort( (int) (col_f->prtype & DATA_MYSQL_TYPE_MASK), @@ -2769,7 +2769,7 @@ wsrep_rec_get_foreign_key( case DATA_BINARY: memcpy(buf, data, len); break; - default: + default: break; } diff --git a/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc index f0f1206ea82..47a77a74908 100644 --- a/storage/innobase/row/row0sel.cc +++ b/storage/innobase/row/row0sel.cc @@ -2733,7 +2733,7 @@ row_sel_field_store_in_mysql_format_func( } /* Copy the actual data */ - ut_memcpy(dest, data, len); + memcpy(dest, data, len); /* Pad with trailing spaces. */ @@ -3618,7 +3618,7 @@ row_sel_copy_cached_field_for_mysql( len = templ->mysql_col_len; } - ut_memcpy(buf, cache, len); + memcpy(buf, cache, len); } /** Copy used fields from cached row. @@ -3685,7 +3685,7 @@ row_sel_dequeue_cached_row_for_mysql( UNIV_MEM_INVALID(buf, prebuilt->mysql_prefix_len); /* First copy the NULL bits. */ - ut_memcpy(buf, cached_rec, prebuilt->null_bitmap_len); + memcpy(buf, cached_rec, prebuilt->null_bitmap_len); /* Then copy the requested fields. */ for (i = 0; i < prebuilt->n_template; i++) { @@ -3702,7 +3702,7 @@ row_sel_dequeue_cached_row_for_mysql( buf, cached_rec, templ); } } else { - ut_memcpy(buf, cached_rec, prebuilt->mysql_prefix_len); + memcpy(buf, cached_rec, prebuilt->mysql_prefix_len); } prebuilt->n_fetch_cached--; @@ -3785,9 +3785,8 @@ row_sel_enqueue_cache_row_for_mysql( next fetch cache slot. */ if (prebuilt->pk_filter || prebuilt->idx_cond) { - byte* dest = row_sel_fetch_last_buf(prebuilt); - - ut_memcpy(dest, mysql_rec, prebuilt->mysql_row_len); + memcpy(row_sel_fetch_last_buf(prebuilt), mysql_rec, + prebuilt->mysql_row_len); } ++prebuilt->n_fetch_cached; diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index 6d78573bb0d..311574a4086 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -2598,7 +2598,7 @@ srv_get_meta_data_filename( } ut_a(path); - len = ut_strlen(path); + len = strlen(path); ut_a(max_len >= len); strcpy(filename, path); diff --git a/storage/innobase/trx/trx0rec.cc b/storage/innobase/trx/trx0rec.cc index a3cf4e9dea0..f5d98e8f05a 100644 --- a/storage/innobase/trx/trx0rec.cc +++ b/storage/innobase/trx/trx0rec.cc @@ -435,7 +435,7 @@ trx_undo_report_insert_virtual( } *ptr += mach_write_compressed(*ptr, flen); - ut_memcpy(*ptr, vfield->data, flen); + memcpy(*ptr, vfield->data, flen); *ptr += flen; } else { if (trx_undo_left(undo_block, *ptr) < 5) { @@ -527,7 +527,7 @@ trx_undo_page_report_insert( return(0); } - ut_memcpy(ptr, dfield_get_data(field), flen); + memcpy(ptr, dfield_get_data(field), flen); ptr += flen; } } @@ -991,7 +991,7 @@ trx_undo_page_report_modify( return(0); } - ut_memcpy(ptr, field, flen); + memcpy(ptr, field, flen); ptr += flen; } } @@ -1188,7 +1188,7 @@ store_len: return(0); } - ut_memcpy(ptr, field, flen); + memcpy(ptr, field, flen); ptr += flen; } @@ -1213,7 +1213,7 @@ store_len: return(0); } - ut_memcpy(ptr, field, flen); + memcpy(ptr, field, flen); ptr += flen; } } @@ -1362,7 +1362,7 @@ store_len: return(0); } - ut_memcpy(ptr, field, flen); + memcpy(ptr, field, flen); ptr += flen; } @@ -1453,7 +1453,7 @@ already_logged: return(0); } - ut_memcpy(ptr, field, flen); + memcpy(ptr, field, flen); ptr += flen; } } diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc index 9afc0071e17..38e98324f7e 100644 --- a/storage/innobase/trx/trx0roll.cc +++ b/storage/innobase/trx/trx0roll.cc @@ -366,8 +366,7 @@ trx_savepoint_find( for (savep = UT_LIST_GET_FIRST(trx->trx_savepoints); savep != NULL; savep = UT_LIST_GET_NEXT(trx_savepoints, savep)) { - - if (0 == ut_strcmp(savep->name, name)) { + if (!strcmp(savep->name, name)) { return(savep); } } |