mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
785695e7c3
Added strings_def.h into strings library to be able to have a DBUG_ASSERT() version without _db_flush() call (as strings.a should not depend on dbug.a) Remove include of m_string.h in all string files (as it's included by string_def.h). Fixed include order. Changed "m_ctype.h" -> <m_ctype.h> include/my_dbug.h: Flush DBUG log in case of DBUG_ASSERT() strings/bchange.c: Include strings_def.h strings/bcmp.c: Include strings_def.h strings/bfill.c: Include strings_def.h strings/bmove.c: Include strings_def.h strings/bmove512.c: Include strings_def.h strings/bmove_upp.c: Include strings_def.h strings/conf_to_src.c: Include strings_def.h Fixed copyright strings/ctype-big5.c: Include strings_def.h strings/ctype-bin.c: Include strings_def.h strings/ctype-cp932.c: Include strings_def.h strings/ctype-czech.c: Include strings_def.h strings/ctype-euc_kr.c: Include strings_def.h strings/ctype-eucjpms.c: Include strings_def.h strings/ctype-extra.c: Include strings_def.h strings/ctype-gbk.c: Include strings_def.h strings/ctype-latin1.c: Include strings_def.h strings/ctype-mb.c: Include strings_def.h strings/ctype-simple.c: Include strings_def.h strings/ctype-sjis.c: Include strings_def.h strings/ctype-tis620.c: Include strings_def.h strings/ctype-uca.c: Include strings_def.h strings/ctype-ucs2.c: Include strings_def.h strings/ctype-ujis.c: Include strings_def.h strings/ctype-utf8.c: Include strings_def.h strings/ctype-win1250ch.c: Include strings_def.h strings/ctype.c: Include strings_def.h strings/decimal.c: Include strings_def.h strings/do_ctype.c: Include strings_def.h strings/int2str.c: Include strings_def.h strings/is_prefix.c: Include strings_def.h strings/llstr.c: Include strings_def.h strings/longlong2str.c: Include strings_def.h strings/longlong2str_asm.c: Include strings_def.h strings/my_strchr.c: Include strings_def.h strings/my_strtoll10.c: Include strings_def.h strings/my_vsnprintf.c: Include strings_def.h strings/r_strinstr.c: Include strings_def.h strings/str2int.c: Include strings_def.h strings/str_alloc.c: Include strings_def.h strings/str_test.c: Include strings_def.h Fixed compiler warnings strings/strappend.c: Include strings_def.h strings/strcend.c: Include strings_def.h strings/strcont.c: Include strings_def.h strings/strend.c: Include strings_def.h strings/strfill.c: Include strings_def.h strings/strinstr.c: Include strings_def.h strings/strmake.c: Include strings_def.h strings/strmov.c: Include strings_def.h strings/strmov_overlapp.c: Include strings_def.h strings/strnlen.c: Include strings_def.h strings/strnmov.c: Include strings_def.h strings/strstr.c: Include strings_def.h strings/strto.c: Include strings_def.h strings/strtod.c: Include strings_def.h strings/strtol.c: Include strings_def.h strings/strtoll.c: Include strings_def.h strings/strtoul.c: Include strings_def.h strings/strtoull.c: Include strings_def.h strings/strxmov.c: Include strings_def.h strings/strxnmov.c: Include strings_def.h strings/uctypedump.c: Include strings_def.h Fixed compiler warnings Removed double include of m_ctype.h strings/udiv.c: Include strings_def.h strings/xml.c: Include strings_def.h
65 lines
2.2 KiB
C
65 lines
2.2 KiB
C
/* 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 : strmake.c
|
|
Author : Michael Widenius
|
|
Updated: 20 Jul 1984
|
|
Defines: strmake()
|
|
|
|
strmake(dst,src,length) moves length characters, or until end, of src to
|
|
dst and appends a closing NUL to dst.
|
|
Note that if strlen(src) >= length then dst[length] will be set to \0
|
|
strmake() returns pointer to closing null
|
|
*/
|
|
|
|
#include "strings_def.h"
|
|
|
|
char *strmake(register char *dst, register const char *src, size_t length)
|
|
{
|
|
while (length--)
|
|
{
|
|
if (! (*dst++ = *src++))
|
|
{
|
|
#ifdef EXTRA_DEBUG
|
|
/*
|
|
'length' is the maximum length of the string; the buffer needs
|
|
to be one character larger to accommodate the terminating
|
|
'\0'. This is easy to get wrong, so we make sure we write to
|
|
the entire length of the buffer to identify incorrect
|
|
buffer-sizes. We only initialism the "unused" part of the
|
|
buffer here, a) for efficiency, and b) because dst==src is
|
|
allowed, so initializing the entire buffer would overwrite the
|
|
source-string. Also, we write a character rather than '\0' as
|
|
this makes spotting these problems in the results easier.
|
|
|
|
If we are using purify/valgrind, we only set one character at
|
|
end to be able to detect also wrong accesses after the end of
|
|
dst.
|
|
*/
|
|
if (length)
|
|
{
|
|
#ifdef HAVE_valgrind
|
|
dst[length-1]= 'Z';
|
|
#else
|
|
bfill(dst, length-1, (int) 'Z');
|
|
#endif /* HAVE_valgrind */
|
|
}
|
|
#endif /* EXTRA_DEBUG */
|
|
return dst-1;
|
|
}
|
|
}
|
|
*dst=0;
|
|
return dst;
|
|
}
|