3459 Davi Arnaut 2010-07-02
Bug#53445: Build with -Wall and fix warnings that it generates
If bzero is not available, resort to memset. Also, remove dead
bzero.c
removed:
strings/bzero.c
modified:
include/m_string.h
3458 Davi Arnaut 2010-07-02
Bug#53445: Build with -Wall and fix warnings that it generates
Apart strict-aliasing warnings, fix the remaining warnings
generated by GCC 4.4.4 -Wall and -Wextra flags.
One major source of warnings was the in-house function my_bcmp
which (unconventionally) took pointers to unsigned characters
as the byte sequences to be compared. Since my_bcmp and bcmp
are deprecated functions whose only difference with memcmp is
the return value, every use of the function is replaced with
memcmp as the special return value wasn't actually being used
by any caller.
There were also various other warnings, mostly due to type
mismatches, missing return values, missing prototypes, dead
code (unreachable) and ignored return values.
@ BUILD/SETUP.sh
Remove flags that are implied by -Wall and -Wextra.
Do not warn about unused parameters in C++.
@ BUILD/check-cpu
Print only the compiler version instead of verbose banner.
Although the option is gcc specific, the check was only
being used for GCC specific checks anyway.
@ client/mysql.cc
bcmp is no longer defined.
@ client/mysqltest.cc
Pass a string to function expecting a format string.
Replace use of bcmp with memcmp.
@ cmd-line-utils/readline/Makefile.am
Always define _GNU_SOURCE when compiling GNU readline.
Required to make certain prototypes visible.
@ cmd-line-utils/readline/input.c
Condition for the code to be meaningful.
@ configure.in
Remove check for bcmp.
@ extra/comp_err.c
Use appropriate type.
@ extra/replace.c
Replace use of bcmp with memcmp.
@ extra/yassl/src/crypto_wrapper.cpp
Do not ignore the return value of fgets. Retrieve the file
position if fgets succeed -- if it fails, the function will
bail out and return a error.
@ extra/yassl/taocrypt/include/blowfish.hpp
Use a single array instead of accessing positions of the sbox_
through a subscript to pbox_.
@ extra/yassl/taocrypt/include/runtime.hpp
One definition of such functions is enough.
@ extra/yassl/taocrypt/src/aes.cpp
Avoid potentially ambiguous conditions.
@ extra/yassl/taocrypt/src/algebra.cpp
Rename arguments to avoid shadowing related warnings.
@ extra/yassl/taocrypt/src/blowfish.cpp
Avoid potentially ambiguous conditions.
@ extra/yassl/taocrypt/src/integer.cpp
Do not define type within a anonymous union.
Use a variable to return a value instead of
leaving the result in a register -- compiler
does not know the logic inside the asm.
@ extra/yassl/taocrypt/src/misc.cpp
Define handler for pure virtual functions.
Remove unused code.
@ extra/yassl/taocrypt/src/twofish.cpp
Avoid potentially ambiguous conditions.
@ extra/yassl/testsuite/test.hpp
Function must have C language linkage.
@ include/m_string.h
Remove check which relied on bcmp being defined -- they weren't
being used as bcmp is only visible when _BSD_SOURCE is defined.
@ include/my_bitmap.h
Remove bogus helpers which were used only in a few files and
were causing warnings about dead code.
@ include/my_global.h
Due to G++ bug, always silence false-positive uninitialized
variables warnings when compiling C++ code with G++.
Remove bogus helper.
@ libmysql/Makefile.shared
Remove built-in implementation of bcmp.
@ mysql-test/lib/My/SafeProcess/safe_process.cc
Cast pid to largest possible type for a process identifier.
@ mysys/mf_loadpath.c
Leave space of the ending nul.
@ mysys/mf_pack.c
Replace bcmp with memcmp.
@ mysys/my_bitmap.c
Dead code removal.
@ mysys/my_gethwaddr.c
Remove unused variable.
@ mysys/my_getopt.c
Silence bogus uninitialized variable warning.
Do not cast away the constant qualifier.
@ mysys/safemalloc.c
Cast to expected type.
@ mysys/thr_lock.c
Silence bogus uninitialized variable warning.
@ sql/field.cc
Replace bogus helper with a more appropriate logic which is
used throughout the code.
@ sql/item.cc
Remove bogus logical condition which always evaluates to TRUE.
@ sql/item_create.cc
Simplify code to avoid signedness related warnings.
@ sql/log_event.cc
Replace use of bcmp with memcmp.
No need to use helpers for simple bit operations.
@ sql/log_event_old.cc
Replace bmove_align with memcpy.
@ sql/mysqld.cc
Move use declaration of variable to the ifdef block where it
is used. Remove now-unnecessary casts and arguments.
@ sql/set_var.cc
Replace bogus helpers with simple and classic bit operations.
@ sql/slave.cc
Cast to expected type and silence bogus warning.
@ sql/sql_class.h
Don't use enum values as bit flags, the supposed type safety is
bogus as the combined bit flags are not a value in the enumeration.
@ sql/udf_example.c
Only declare variable when necessary.
@ sql/unireg.h
Replace use of bmove_align with memcpy.
@ storage/innobase/os/os0file.c
Silence bogus warning.
@ storage/myisam/mi_open.c
Remove bogus cast, DBUG_DUMP expects a pointer to unsigned
char.
@ storage/myisam/mi_page.c
Remove bogus cast, DBUG_DUMP expects a pointer to unsigned
char.
@ strings/bcmp.c
Remove built-in bcmp.
@ strings/ctype-ucs2.c
Silence bogus warning.
@ tests/mysql_client_test.c
Use a appropriate type as expected by simple_command().
removed:
strings/bcmp.c
modified:
BUILD/SETUP.sh
BUILD/check-cpu
client/mysql.cc
client/mysqltest.cc
cmd-line-utils/readline/Makefile.am
cmd-line-utils/readline/input.c
configure.in
extra/comp_err.c
extra/replace.c
extra/yassl/src/crypto_wrapper.cpp
extra/yassl/taocrypt/include/blowfish.hpp
extra/yassl/taocrypt/include/runtime.hpp
extra/yassl/taocrypt/src/aes.cpp
extra/yassl/taocrypt/src/algebra.cpp
extra/yassl/taocrypt/src/blowfish.cpp
extra/yassl/taocrypt/src/integer.cpp
extra/yassl/taocrypt/src/misc.cpp
extra/yassl/taocrypt/src/twofish.cpp
extra/yassl/testsuite/test.hpp
include/m_string.h
include/my_bitmap.h
include/my_global.h
libmysql/Makefile.shared
libmysql/libmysql.c
mysql-test/lib/My/SafeProcess/safe_process.cc
mysys/mf_loadpath.c
mysys/mf_pack.c
mysys/my_bitmap.c
mysys/my_gethwaddr.c
mysys/my_getopt.c
mysys/my_handler.c
mysys/safemalloc.c
mysys/thr_lock.c
regex/regcomp.c
sql/field.cc
sql/item.cc
sql/item_create.cc
sql/log.cc
sql/log_event.cc
sql/log_event_old.cc
sql/mysqld.cc
sql/rpl_rli.cc
sql/set_var.cc
sql/set_var.h
sql/slave.cc
sql/sql_base.cc
sql/sql_class.h
sql/sql_repl.cc
sql/udf_example.c
sql/unireg.h
storage/heap/hp_hash.c
storage/heap/hp_test2.c
storage/innobase/os/os0file.c
storage/myisam/mi_open.c
storage/myisam/mi_page.c
storage/myisam/mi_search.c
storage/myisam/mi_test2.c
storage/myisam/mi_unique.c
storage/myisammrg/ha_myisammrg.cc
strings/CMakeLists.txt
strings/Makefile.am
strings/ctype-ucs2.c
strings/make-ccc
strings/str_test.c
strings/xml.c
tests/mysql_client_test.c
=== modified file 'include/m_string.h'
--- a/include/m_string.h 2010-07-02 18:30:47 +0000
+++ b/include/m_string.h 2010-07-02 21:42:32 +0000
@@ -58,6 +58,10 @@
# define bfill(A,B,C) memset((A),(C),(B))
#endif
+#if !defined(bzero) && !defined(HAVE_BZERO)
+# define bzero(A,B) memset((A),0,(B))
+#endif
+
#if defined(__cplusplus)
extern "C" {
#endif
@@ -104,10 +108,6 @@ extern const double log_10[309];
extern void bfill(uchar *dst,size_t len,pchar fill);
#endif
-#if !defined(bzero) && !defined(HAVE_BZERO)
-extern void bzero(uchar * dst,size_t len);
-#endif
-
#ifndef bmove512
extern void bmove512(uchar *dst,const uchar *src,size_t len);
#endif
=== removed file 'strings/bzero.c'
--- a/strings/bzero.c 2006-12-23 19:17:15 +0000
+++ b/strings/bzero.c 1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
- 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 Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-
-/* File : bzero.c
- Author : Richard A. O'Keefe.
- Michael Widenius; ifdef MC68000
- Updated: 23 April 1984
- Defines: bzero()
-
- bzero(dst, len) moves "len" 0 bytes to "dst".
- Thus to clear a disc buffer to 0s do bzero(buffer, BUFSIZ).
-
- Note: the "b" routines are there to exploit certain VAX order codes,
- The asm code is presented for your interest and amusement.
-*/
-
-#ifndef BSD_FUNCS
-#include "strings.h"
-
-#ifdef bzero
-#undef bzero /* remove macro */
-#endif
-
-#if VaxAsm
-
-static void _bzero64 _A((char *dst,int len));
-
-void bzero(dst, len)
-char *dst;
-uint len;
-{
- while ((int) len >= 64*K)
- {
- _bzero64(dst, 64*K-1);
- dst += 64*K-1;
- len -= 64*K-1;
- }
- _bzero64(dst, len);
-}
-
-_bzero64(dst, len)
-char *dst;
-int len;
-{
- asm("movc5 $0,*4(ap),$0,8(ap),*4(ap)");
-}
-
-#else
-
-#if defined(MC68000) && defined(DS90)
-
-void bzero(dst, len)
-char *dst;
-uint len;
-{
- bfill(dst,len,0); /* This is very optimized ! */
-} /* bzero */
-
-#else
-
-void bzero(dst, len)
-register char *dst;
-register uint len;
-{
- while (len-- != 0) *dst++ = 0;
-} /* bzero */
-
-#endif
-#endif
-#endif /* BSD_FUNCS */
Attachment: [text/bzr-bundle] bzr/davi.arnaut@sun.com-20100702214232-m4crvlondb3pox3s.bundle
| Thread |
|---|
| • bzr push into mysql-5.1-bugteam branch (davi:3458 to 3459) Bug#53445 | Davi Arnaut | 2 Jul |
