• unknown's avatar
    Fixed compiler warnings detected by option -Wshadow and -Wunused: · f00257dd
    unknown authored
    - Removed not used variables and functions
    - Added #ifdef around code that is not used
    - Renamed variables and functions to avoid conflicts
    - Removed some not used arguments
    
    Fixed some class/struct warnings in ndb
    Added define IS_LONGDATA() to simplify code in libmysql.c
    
    I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
    
    
    BUILD/SETUP.sh:
      Added printing of unused functions and variables.
      Made it easy to test compiling with -Wshadow
    BUILD/compile-pentium-gcov:
      Added warnings
      Mark binary with -gcov
    client/mysql.cc:
      Fixed warnings found with gcc -Wshadow
    client/mysql_upgrade.c:
      Fixed warnings found with gcc -Wshadow
    client/mysqlbinlog.cc:
      Fixed warnings found with gcc -Wshadow
    client/mysqldump.c:
      Fixed warnings found with gcc -Wshadow
    client/mysqltest.c:
      Fixed warnings found with gcc -Wshadow
    client/sql_string.cc:
      Fixed warnings found with gcc -Wshadow
      Merged with sql/sql_string.cc
    client/sql_string.h:
      Fixed warnings found with gcc -Wshadow
      Merged with sql/sql_string.h
    cmd-line-utils/readline/display.c:
      Fixed compiler warning
    cmd-line-utils/readline/histexpand.c:
      Fixed warnings found with gcc -Wshadow
    cmd-line-utils/readline/input.c:
      Fixed warnings found with gcc -Wshadow
    cmd-line-utils/readline/text.c:
      Fixed warnings found with gcc -Wshadow
    cmd-line-utils/readline/vi_mode.c:
      Fixed warnings found with gcc -Wshadow
    dbug/dbug_analyze.c:
      Fixed warnings found with gcc -Wshadow
    extra/my_print_defaults.c:
      Prefixed defaults_extra_file and defaults_group_suffix with 'my' to avoid conflicts with similar named local variables
    extra/yassl/include/buffer.hpp:
      Fixed compiler warnings
    extra/yassl/include/crypto_wrapper.hpp:
      Fixed compiler warnings
    extra/yassl/include/yassl_imp.hpp:
      Fixed compiler warnings
    extra/yassl/include/yassl_int.hpp:
      Fixed compiler warnings
    extra/yassl/src/crypto_wrapper.cpp:
      Fixed compiler warnings
    extra/yassl/taocrypt/benchmark/benchmark.cpp:
      Fixed warnings found with gcc -Wshadow
    extra/yassl/taocrypt/include/algebra.hpp:
      Fixed compiler warnings
    extra/yassl/taocrypt/include/des.hpp:
      Fixed compiler warnings
    extra/yassl/taocrypt/include/hash.hpp:
      Fixed compiler warnings
    extra/yassl/taocrypt/include/hmac.hpp:
      Fixed compiler warnings
    extra/yassl/taocrypt/include/modarith.hpp:
      Fixed compiler warnings
    extra/yassl/taocrypt/include/modes.hpp:
      Fixed compiler warnings
    extra/yassl/taocrypt/include/rsa.hpp:
      Fixed compiler warnings
    extra/yassl/taocrypt/mySTL/list.hpp:
      Fixed compiler warnings
    extra/yassl/taocrypt/src/aes.cpp:
      Fixed compiler warnings
    extra/yassl/taocrypt/src/algebra.cpp:
      Fixed compiler warnings
    extra/yassl/taocrypt/src/asn.cpp:
      Fixed compiler warnings
    extra/yassl/taocrypt/test/test.cpp:
      Fixed compiler warnings
    extra/yassl/testsuite/testsuite.cpp:
      Fixed compiler warnings
    include/m_ctype.h:
      Fixed warnings found with gcc -Wshadow
    include/my_pthread.h:
      Fixed warnings found with gcc -Wshadow
    include/my_sys.h:
      Fixed warnings found with gcc -Wshadow
    include/my_time.h:
      Fixed warnings found with gcc -Wshadow
    include/mysql.h:
      Fixed warnings found with gcc -Wshadow
      Added define IS_LONGDATA() to simplify code in libmysql.c
    libmysql/libmysql.c:
      Fixed warnings found with gcc -Wshadow
      (Mostly replaced bind -> my_bind and time -> my_time)
    libmysqld/lib_sql.cc:
      Removed not used variables and labels
    myisam/ft_boolean_search.c:
      Fixed warnings found with gcc -Wshadow
    myisam/mi_open.c:
      Fixed warnings found with gcc -Wshadow
    myisam/mi_search.c:
      Fixed warnings found with gcc -Wshadow
    myisam/mi_unique.c:
      Fixed compiler warning
    myisam/myisampack.c:
      Fixed warnings found with gcc -Wshadow
    myisam/rt_index.c:
      Remove not used variables
    myisam/sort.c:
      Fixed warnings found with gcc -Wshadow
    mysql-test/r/mysqlcheck.result:
      Remove databases and tables possible left by previous test
    mysql-test/r/mysqltest.result:
      New test results
    mysql-test/t/mysql.test:
      Coverage tests
    mysql-test/t/mysqlbinlog.test:
      Coverage tests
    mysql-test/t/mysqlcheck.test:
      Remove databases and tables possible left by previous test
    mysql-test/t/mysqltest.test:
      Coverage tests
    mysys/default.c:
      Prefixed defaults_file, defaults_group_suffix and defaults_extra_file with 'my' to avoid conflicts with local variables in some functions
    mysys/mf_iocache2.c:
      Fixed warnings found with gcc -Wshadow
    mysys/mf_keycache.c:
      Fixed warnings found with gcc -Wshadow
    mysys/my_bitmap.c:
      Fixed warnings found with gcc -Wshadow
    mysys/sha1.c:
      Fixed warnings found with gcc -Wshadow
    ndb/include/kernel/signaldata/ArbitSignalData.hpp:
      Fixed compiler warning
    ndb/include/kernel/signaldata/DictTabInfo.hpp:
      Fixed compiler warnings
    ndb/include/ndbapi/NdbReceiver.hpp:
      Fixed warnings found with gcc -Wshadow
    ndb/include/transporter/TransporterDefinitions.hpp:
      Fixed compiler warning
    ndb/include/util/InputStream.hpp:
      Fixed compiler warning
    ndb/include/util/OutputStream.hpp:
      Fixed compiler warning
    ndb/include/util/SimpleProperties.hpp:
      Fixed compiler warning
    ndb/include/util/SocketAuthenticator.hpp:
      Fixed compiler warning
    ndb/include/util/SocketServer.hpp:
      Fixed compiler warning
    ndb/src/common/mgmcommon/ConfigRetriever.cpp:
      Fixed warnings found with gcc -Wshadow
    ndb/src/common/portlib/NdbTick.c:
      Fixed warnings found with gcc -Wshadow
    ndb/src/common/transporter/SHM_Transporter.cpp:
      Fixed warnings found with gcc -Wshadow
    ndb/src/common/transporter/TCP_Transporter.cpp:
      Fixed warnings found with gcc -Wshadow
    ndb/src/common/transporter/TCP_Transporter.hpp:
      Fixed compiler warning
    ndb/src/common/transporter/Transporter.cpp:
      Removed not used variable
    ndb/src/common/transporter/TransporterRegistry.cpp:
      Removed not used variable
    ndb/src/common/util/Bitmask.cpp:
      Moved function to avoid warnings of not used function
    ndb/src/common/util/ConfigValues.cpp:
      Fixed warnings found with gcc -Wshadow
    ndb/src/common/util/File.cpp:
      Fixed warnings found with gcc -Wshadow
    ndb/src/common/util/Properties.cpp:
      Fixed warnings found with gcc -Wshadow
    ndb/src/common/util/SocketClient.cpp:
      Fixed wrong return value
    ndb/src/common/util/random.c:
      Fixed warnings found with gcc -Wshadow
    ndb/src/common/util/socket_io.cpp:
      Fixed warnings found with gcc -Wshadow
    ndb/src/cw/cpcd/APIService.cpp:
      Removed not used variable
    ndb/src/cw/cpcd/main.cpp:
      Removed not used variables
    ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
      Fixed compiler warnings
    ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
      Removed not used variables
    ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
      Fixed compiler warnings
    ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
      Fixed compiler warnings
    ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
      Fixed compiler warnings
    ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
      Removed not used variables
    ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
      Fixed compiler warnings
    ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
      Fixed compiler warnings
    ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
      Removed not used variable
    ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
      Removed not used variables
    ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
      Removed not used variables
    ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
      Removed not used variables
    ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
      Fixed compiler warnings
    ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
      Removed not used variables
    ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
      Fixed compiler warnings
    ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
      Fixed compiler warnings
    ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
      Removed not used variables
    ndb/src/kernel/blocks/suma/Suma.cpp:
      Removed not used variables
    ndb/src/kernel/blocks/suma/Suma.hpp:
      Fixed compiler warnings
    ndb/src/kernel/vm/MetaData.hpp:
      Fixed compiler warnings
    ndb/src/mgmapi/LocalConfig.cpp:
      Fixed warnings found with gcc -Wshadow
    ndb/src/mgmapi/mgmapi.cpp:
      Fixed warnings found with gcc -Wshadow
    ndb/src/mgmclient/CommandInterpreter.cpp:
      Removed not used variables
    ndb/src/mgmsrv/ConfigInfo.cpp:
      Fixed warnings found with gcc -Wshadow
      Removed not used variables
    ndb/src/mgmsrv/ConfigInfo.hpp:
      Fixed warnings found with gcc -Wshadow
    ndb/src/mgmsrv/InitConfigFileParser.cpp:
      Prefixed defaults_file, defaults_group_suffix and defaults_extra_file with 'my' to avoid conflicts with local variables in some functions
    ndb/src/mgmsrv/MgmtSrvr.cpp:
      Removed not used variables and functions
    ndb/src/mgmsrv/MgmtSrvr.hpp:
      Fixed compiler warnings
    ndb/src/mgmsrv/Services.cpp:
      Removed not used variables and functions
    ndb/src/mgmsrv/main.cpp:
      Removed not used variable
    ndb/src/ndbapi/ClusterMgr.hpp:
      Fixed compiler warnings
    ndb/src/ndbapi/Ndb.cpp:
      Removed not used variables
    ndb/src/ndbapi/NdbBlob.cpp:
      Removed not used variables
    ndb/src/ndbapi/NdbDictionaryImpl.cpp:
      Removed not used variables
    ndb/src/ndbapi/NdbIndexOperation.cpp:
      Removed not used variables
    ndb/src/ndbapi/NdbOperationDefine.cpp:
      Removed not used variables
    ndb/src/ndbapi/NdbOperationExec.cpp:
      Removed not used variables
    ndb/src/ndbapi/NdbOperationSearch.cpp:
      Removed not used variables
    ndb/src/ndbapi/NdbScanFilter.cpp:
      Fixed compiler warning
    ndb/src/ndbapi/NdbScanOperation.cpp:
      Removed not used variables
    ndb/src/ndbapi/SignalSender.cpp:
      Removed not used variables
    ndb/src/ndbapi/ndb_cluster_connection.cpp:
      Removed not used variable
    ndb/tools/delete_all.cpp:
      Removed not used variable
    ndb/tools/desc.cpp:
      Removed not used variable
    ndb/tools/drop_index.cpp:
      Removed not used variable
    ndb/tools/drop_tab.cpp:
      Removed not used variable
    ndb/tools/listTables.cpp:
      Removed not used variable
    ndb/tools/ndb_config.cpp:
      Fixed warnings found with gcc -Wshadow
      Added missing puts(desc)
    ndb/tools/restore/Restore.hpp:
      Changed delimiter to define instead of static variable, as the static variable caused a LOT of compiler warnings
      Fixed compiler warning
    ndb/tools/restore/consumer.hpp:
      Fixed compiler warning
    ndb/tools/restore/restore_main.cpp:
      Fixed compiler warnings
    ndb/tools/select_all.cpp:
      Removed not used variables
    ndb/tools/select_count.cpp:
      Removed not used variable
    server-tools/instance-manager/commands.h:
      Fixed compiler warnings
    server-tools/instance-manager/guardian.cc:
      Fixed compiler warnings
    server-tools/instance-manager/instance_options.cc:
      Removed not used variables
    server-tools/instance-manager/mysql_connection.cc:
      Fixed compiler warnings
    server-tools/instance-manager/options.cc:
      Fixed compiler warnings
    server-tools/instance-manager/options.h:
      Fixed compiler warnings
    server-tools/instance-manager/parse.cc:
      Removed not used variable
    server-tools/instance-manager/user_map.cc:
      Fixed compiler warnings
    server-tools/instance-manager/user_map.h:
      Fixed compiler warnings
    sql/field.cc:
      Fixed compiler warnings
    sql/field.h:
      Fixed compiler warnings
    sql/filesort.cc:
      Fixed compiler warnings
    sql/ha_archive.cc:
      Removed table and share arguments from get_share() / free_share() to get rid of compiler warnings
    sql/ha_archive.h:
      Removed table and share arguments from get_share() / free_share() to get rid of compiler warnings
    sql/ha_federated.cc:
      Fixed compiler warnings
    sql/ha_heap.cc:
      Fixed compiler warnings
    sql/ha_myisam.cc:
      Fixed compiler warnings
    sql/ha_myisammrg.cc:
      Fixed compiler warnings
    sql/ha_ndbcluster.cc:
      Fixed compiler warnings
    sql/handler.cc:
      Fixed compiler warnings
    sql/item.cc:
      Fixed compiler warnings
    sql/item.h:
      Fixed compiler warnings
      new_item() -> clone_item(), to avoid a lot of warnings with variable 'new_item'
      el() -> element_index()
    sql/item_cmpfunc.cc:
      Fixed compiler warnings
    sql/item_cmpfunc.h:
      Fixed compiler warnings
    sql/item_func.cc:
      Fixed compiler warnings
    sql/item_geofunc.cc:
      Fixed compiler warnings
    sql/item_row.h:
      Fixed compiler warnings
    sql/item_strfunc.cc:
      Fixed compiler warnings
    sql/item_subselect.cc:
      Fixed compiler warnings
    sql/item_subselect.h:
      Fixed compiler warnings
    sql/item_sum.cc:
      Fixed compiler warnings
    sql/item_timefunc.cc:
      Fixed compiler warnings
    sql/log.cc:
      Fixed compiler warnings
      More comments
      Added #ifdef HAVE_REPLICATION
    sql/log_event.cc:
      Fixed compiler warnings
    sql/log_event.h:
      Fixed compiler warnings
    sql/mysql_priv.h:
      query_id -> global_query_id, to avoid a lot of clashes with function and class variables
      start_time -> server_start_time
    sql/mysqld.cc:
      Fixed compiler warnings:
      - Removed not used variables
      - Added #ifndef EMBEDDED_LIBRARY
      - Fixed shadow warnings
    sql/net_serv.cc:
      Fixed compiler warnings
    sql/opt_range.cc:
      range -> last_range to avoid shadow warnings
      Removed not used function print_rowid()
    sql/opt_range.h:
      range -> last_range to avoid shadow warnings
    sql/password.c:
      Fixed compiler warnings
    sql/protocol.cc:
      Fixed compiler warnings
    sql/repl_failsafe.cc:
      Fixed compiler warnings
    sql/set_var.cc:
      Fixed compiler warnings
    sql/set_var.h:
      type() -> show_type()
      Fixed compiler warnings
    sql/slave.cc:
      Fixed compiler warnings
    sql/sp_head.cc:
      Fixed compiler warnings
    sql/sp_head.h:
      Fixed compiler warnings
    sql/spatial.cc:
      Fixed compiler warnings
    sql/spatial.h:
      length() -> geom_length() to avoid compiler warnings
      wkb_end -> wkb_last to avoid compiler warnings with local variables named 'wkb_end'
    sql/sql_cache.h:
      Fixed compiler warnings
    sql/sql_class.cc:
      Fixed compiler warnings
    sql/sql_class.h:
      log -> log_xid() to avoid compiler warnings
      Fixed shadow compiler warnings
    sql/sql_derived.cc:
      Removed not used variable
    sql/sql_insert.cc:
      Fixed compiler warnings
    sql/sql_lex.cc:
      Fixed compiler warnings
    sql/sql_lex.h:
      res -> saved_error to make the meaning of the variable clear and avoid shadow warnings
    sql/sql_load.cc:
      Fixed compiler warnings
    sql/sql_parse.cc:
      Fixed compiler warnings
    sql/sql_prepare.cc:
      Fixed compiler warnings
    sql/sql_select.cc:
      Fixed compiler warnings
    sql/sql_show.cc:
      Fixed compiler warnings
    sql/sql_string.cc:
      Fixed compiler warnings
    sql/sql_string.h:
      Fixed compiler warnings
    sql/sql_table.cc:
      Fixed compiler warnings
    sql/sql_trigger.cc:
      Fixed compiler warnings
    sql/sql_trigger.h:
      table -> trigger_table to avoid warnings from local variables
    sql/sql_union.cc:
      Fixed compiler warnings
      (mainly res -> saved_error)
    sql-common/client.c:
      Removed not used variable
    sql-common/my_time.c:
      Removed not used variable
      time -> my_time
    sql/sql_update.cc:
      Removed not used variable
    sql/sql_view.cc:
      Removed not used variable
    sql/sql_yacc.yy:
      Removed not used variable
    sql/table.cc:
      Removed not used variable
    sql/tztime.cc:
      Removed not used variable
    sql/unireg.cc:
      Removed not used variable
    strings/ctype-bin.c:
      mblen -> mb_len to avoid compiler warnings with local variable mblen
    strings/ctype-cp932.c:
      Fixed compiler warnings
    strings/ctype-eucjpms.c:
      Fixed compiler warnings
    strings/ctype-mb.c:
      mblen -> mb_len to avoid compiler warnings with local variable mblen
    strings/ctype-simple.c:
      mblen -> mb_len to avoid compiler warnings with local variable mblen
      exp -> exponent
    strings/ctype-sjis.c:
      Fixed compiler warnings
    strings/ctype-uca.c:
      mblen -> mb_len to avoid compiler warnings with local variable mblen
    strings/ctype-ujis.c:
      Fixed compiler warnings
    strings/ctype-utf8.c:
      Fixed compiler warnings
    strings/decimal.c:
      Fixed compiler warnings
    strings/my_vsnprintf.c:
      Added comment
    strings/strtod.c:
      Fixed compiler warnings
    tests/mysql_client_test.c:
      Fixed compiler warnings
      (Biggest part of patch is to not get a conflict with global function 'bind')
    f00257dd
mysqld.cc 274 KB