mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug#53445: Build with -Wall and fix warnings that it generates

Browse source 
If bzero is not available, resort to memset. Also, remove dead
bzero.c
This commit is contained in:
Davi Arnaut 2010-07-02 18:42:32 -03:00
parent 93fb8bb235
commit 082036ac6b
2 changed files with 4 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/m_string.h
View file

@ -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

82
strings/bzero.c
View file

@ -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 */