Flush DBUG log in case of DBUG_ASSERT()

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
2011-01-30 12:41:44 +02:00 · 2011-01-30 12:41:44 +02:00 · 785695e7c3
commit 785695e7c3
parent c46305ab48
66 changed files with 137 additions and 179 deletions
--- a/include/my_dbug.h
+++ b/include/my_dbug.h
@ -126,7 +126,7 @@ extern  void _db_flush_();
 #define DBUG_END()  _db_end_ ()
 #define DBUG_LOCK_FILE _db_lock_file_()
 #define DBUG_UNLOCK_FILE _db_unlock_file_()
-#define DBUG_ASSERT(A) assert(A)
+#define DBUG_ASSERT(A) do { _db_flush_(); assert(A); } while(0)
 #define DBUG_EXPLAIN(buf,len) _db_explain_(0, (buf),(len))
 #define DBUG_EXPLAIN_INITIAL(buf,len) _db_explain_init_((buf),(len))
 #define DEBUGGER_OFF                    do { _dbug_on_= 0; } while(0)
--- a/strings/bchange.c
+++ b/strings/bchange.c
@ -23,8 +23,7 @@
    src in a buffer with tot_length bytes.
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 void bchange(register uchar *dst, size_t old_length, register const uchar *src,
 	     size_t new_length, size_t tot_length)
--- a/strings/bcmp.c
+++ b/strings/bcmp.c
@ -21,8 +21,7 @@
  comparing a shorter string with bcmp.
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 #ifdef HAVE_valgrind
 #undef bcmp
--- a/strings/bfill.c
+++ b/strings/bfill.c
@ -29,8 +29,7 @@
    code is presented for your interest and amusement.
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 #if !defined(bfill) && !defined(HAVE_BFILL)

--- a/strings/bmove.c
+++ b/strings/bmove.c
@ -36,8 +36,7 @@
    code is presented for your interest and amusement.
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 #if !defined(HAVE_BMOVE) && !defined(bmove)

--- a/strings/bmove512.c
+++ b/strings/bmove512.c
@ -25,8 +25,7 @@
    fastest way to move a mutiple of 512 byte.
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 #ifndef bmove512

--- a/strings/bmove_upp.c
+++ b/strings/bmove_upp.c
@ -22,8 +22,7 @@
    "src-len" to the destination "dst-len" counting downwards.
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 #if defined(MC68000) && defined(DS90)

--- a/strings/conf_to_src.c
+++ b/strings/conf_to_src.c
@ -13,8 +13,7 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

-#include <my_global.h>
-#include <m_string.h>
+#include "strings_def.h"
 #include <m_ctype.h>
 #include <fcntl.h>
 #include <my_xml.h>
@ -250,7 +249,7 @@ static void
 fprint_copyright(FILE *file)
 {
  fprintf(file,
-"/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.\n"
+"/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems Inc., 2010-2011 Monty Program Ab\n"
 "\n"
 "   This program is free software; you can redistribute it and/or modify\n"
 "   it under the terms of the GNU General Public License as published by\n"
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.c
@ -26,9 +26,8 @@
 * .configure. mbmaxlen_big5=2
 */

-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>

 #ifdef HAVE_CHARSET_big5

--- a/strings/ctype-bin.c
+++ b/strings/ctype-bin.c
@ -18,9 +18,8 @@
 /* This file is for binary pseudo charset, created by bar@mysql.com */


-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>

 static uchar ctype_bin[]=
 {
--- a/strings/ctype-cp932.c
+++ b/strings/ctype-cp932.c
@ -16,9 +16,8 @@
 /* This file is for cp932 charaset (Windows Japanese),
   and created based on ctype-sjis.c file  */

-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>

 #ifdef HAVE_CHARSET_cp932

--- a/strings/ctype-czech.c
+++ b/strings/ctype-czech.c
@ -65,9 +65,8 @@

 #ifdef REAL_MYSQL

-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>

 #else

@ -427,8 +426,7 @@ static my_bool my_like_range_czech(CHARSET_INFO *cs __attribute__((unused)),
 *
 * definition table reworked by Jaromir Dolecek <dolecek@ics.muni.cz>
 */
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 static uchar NEAR ctype_czech[257] = {
 0,
--- a/strings/ctype-euc_kr.c
+++ b/strings/ctype-euc_kr.c
@ -25,9 +25,8 @@
 * .configure. mbmaxlen_euc_kr=2
 */

-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>

 #ifdef HAVE_CHARSET_euckr

--- a/strings/ctype-eucjpms.c
+++ b/strings/ctype-eucjpms.c
@ -26,9 +26,8 @@ ctype-ujis.c file.
 * .configure. mbmaxlen_eucjpms=3
 */

-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>

 #ifdef HAVE_CHARSET_eucjpms

--- a/strings/ctype-extra.c
+++ b/strings/ctype-extra.c
@ -21,7 +21,7 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */

-#include <my_global.h>
+#include "strings_def.h"
 #include <m_ctype.h>

 #ifdef HAVE_CHARSET_dec8
--- a/strings/ctype-gb2312.c
+++ b/strings/ctype-gb2312.c
@ -23,9 +23,8 @@
 * .configure. mbmaxlen_gb2312=2
 */

-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>

 #ifdef HAVE_CHARSET_gb2312

--- a/strings/ctype-gbk.c
+++ b/strings/ctype-gbk.c
@ -26,9 +26,8 @@
 */


-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>

 #ifdef HAVE_CHARSET_gbk

--- a/strings/ctype-latin1.c
+++ b/strings/ctype-latin1.c
@ -13,9 +13,8 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>

 static uchar ctype_latin1[] = {
    0,
--- a/strings/ctype-mb.c
+++ b/strings/ctype-mb.c
@ -13,9 +13,8 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

-#include <my_global.h>
-#include "m_ctype.h"
-#include "m_string.h"
+#include "strings_def.h"
+#include <m_ctype.h>

 #ifdef USE_MB

--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@ -13,9 +13,8 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 #include "my_sys.h"  /* Needed for MY_ERRNO_ERANGE */
 #include <errno.h>

--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@ -16,9 +16,8 @@
 /* This file is for Shift JIS charset, and created by tommy@valley.ne.jp.
 */

-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>

 #ifdef HAVE_CHARSET_sjis

--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@ -47,11 +47,10 @@
 * .configure. strxfrm_multiply_tis620=4
 */

-#include <my_global.h>
-#include <my_sys.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 #include "t_ctype.h"
+#include <my_sys.h>

 #ifdef HAVE_CHARSET_tis620

--- a/strings/ctype-uca.c
+++ b/strings/ctype-uca.c
@ -32,10 +32,8 @@
 */


-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
-
+#include "strings_def.h"
+#include <m_ctype.h>

 #define MY_UCA_CNT_FLAG_SIZE 4096
 #define MY_UCA_CNT_FLAG_MASK 4095
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@ -17,11 +17,9 @@

 /* UCS2 support. Written by Alexander Barkov <bar@mysql.com> */

-#include <my_global.h>
+#include "strings_def.h"
+#include <m_ctype.h>
 #include <my_sys.h>
-#include "m_string.h"
-#include "m_ctype.h"
-#include <errno.h>
 #include <stdarg.h>


--- a/strings/ctype-ujis.c
+++ b/strings/ctype-ujis.c
@ -25,9 +25,8 @@
 * .configure. mbmaxlen_ujis=3
 */

-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>

 #ifdef HAVE_CHARSET_ujis

--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@ -18,10 +18,8 @@
 /* UTF8 according RFC 2279 */
 /* Written by Alexander Barkov <bar@udm.net> */

-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
-#include <errno.h>
+#include "strings_def.h"
+#include <m_ctype.h>

 #ifndef EILSEQ
 #define EILSEQ ENOENT
--- a/strings/ctype-win1250ch.c
+++ b/strings/ctype-win1250ch.c
@ -40,8 +40,7 @@
 #ifdef REAL_MYSQL

 #include "my_global.h"
-#include "m_string.h"
-#include "m_ctype.h"
+#include <m_ctype.h>

 #else

--- a/strings/ctype.c
+++ b/strings/ctype.c
@ -13,13 +13,9 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

-#include <my_global.h>
+#include "strings_def.h"
 #include <m_ctype.h>
 #include <my_xml.h>
-#ifndef SCO
-#include <m_string.h>
-#endif
-

 /*

--- a/strings/decimal.c
+++ b/strings/decimal.c
@ -99,11 +99,10 @@
      implementation-defined.
 */

-#include <my_global.h>
+#include "strings_def.h"
 #include <m_ctype.h>
 #include <myisampack.h>
 #include <my_sys.h> /* for my_alloca */
-#include <m_string.h>
 #include <decimal.h>

 /*
--- a/strings/do_ctype.c
+++ b/strings/do_ctype.c
@ -20,10 +20,9 @@
 #undef DBUG_OFF
 #endif

-#include <my_global.h>
+#include "strings_def.h"
 #include <ctype.h>
 #include <my_sys.h>
-#include "m_string.h"

 uchar NEAR to_upper[256];
 uchar NEAR to_lower[256],NEAR sort_order[256];
--- a/strings/int2str.c
+++ b/strings/int2str.c
@ -13,8 +13,7 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 /*
  _dig_vec arrays are public because they are used in several outer places.
--- a/strings/is_prefix.c
+++ b/strings/is_prefix.c
@ -21,8 +21,7 @@
    A empty t is allways a prefix.
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 int is_prefix(register const char *s, register const char *t)
 {
--- a/strings/llstr.c
+++ b/strings/llstr.c
@ -24,8 +24,7 @@
 */


-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 char *llstr(longlong value,char *buff)
 {
--- a/strings/longlong2str.c
+++ b/strings/longlong2str.c
@ -37,8 +37,7 @@
 	itoa assumes that 10 -base numbers are allways signed and other arn't.
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 #if defined(HAVE_LONG_LONG) && !defined(longlong2str) && !defined(HAVE_LONGLONG2STR)

--- a/strings/longlong2str_asm.c
+++ b/strings/longlong2str_asm.c
@ -20,8 +20,7 @@
  _dig_vector in a portable manner.
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 extern char *longlong2str_with_dig_vector(longlong val,char *dst,int radix,
                                          const char *dig_vector);
--- a/strings/my_strchr.c
+++ b/strings/my_strchr.c
@ -21,9 +21,8 @@
  frequently.
 */

-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>


 char *my_strchr(CHARSET_INFO *cs, const char *str, const char *end,
--- a/strings/my_strtoll10.c
+++ b/strings/my_strtoll10.c
@ -13,9 +13,8 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

-#include <my_global.h>
+#include "strings_def.h"
 #include <my_sys.h>            /* Needed for MY_ERRNO_ERANGE */
-#include <m_string.h>

 #undef  ULONGLONG_MAX
 /*
--- a/strings/my_vsnprintf.c
+++ b/strings/my_vsnprintf.c
@ -13,10 +13,9 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

-#include <my_global.h>
-#include <m_string.h>
-#include <stdarg.h>
+#include "strings_def.h"
 #include <m_ctype.h>
+#include <stdarg.h>

 /*
  Limited snprintf() implementations
--- a/strings/r_strinstr.c
+++ b/strings/r_strinstr.c
@ -22,8 +22,7 @@
  the pattern counted from the begining of the string.
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 size_t r_strinstr(reg1 const char * str, size_t from, reg4 const char * search)
 {
--- a/strings/str2int.c
+++ b/strings/str2int.c
@ -37,9 +37,8 @@
  call has no problems.
 */

-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 #include "my_sys.h"			/* defines errno */
 #include <errno.h>

--- a/strings/str_alloc.c
+++ b/strings/str_alloc.c
@ -13,8 +13,7 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

-#include <my_global.h>
-#include <m_string.h>
+#include "strings_def.h"

 static void *my_str_malloc_default(size_t size)
 {
--- a/strings/str_test.c
+++ b/strings/str_test.c
@ -15,9 +15,8 @@

 /* Test of all stringfunktions that is coded in assembler */

-#include <my_global.h>
+#include "strings_def.h"
 #include <stdarg.h>
-#include "m_string.h"

 #define F_LEN	8
 #define F_CHAR	'A'
@ -50,10 +49,10 @@ int main(void)
  errors=tests=0;
  init_strings();

-  test_arg("bcmp(from,to,5)",(long) my_test(bcmp(from,to,5)),1L);
-  test_arg("bcmp(from,from,5)",(long) bcmp(from,from,5),0L);
+  test_arg("bcmp(from,to,5)",(long) my_test(bcmp((uchar*) from, (uchar*) to,5)),1L);
+  test_arg("bcmp(from,from,5)",(long) bcmp((uchar*) from, (uchar*) from,5),0L);

-  test_arg("bcmp(from,to,0)",(long) bcmp(from,to,0),0L);
+  test_arg("bcmp(from,to,0)",(long) bcmp((uchar*) from, (uchar*) to,0),0L);
  test_arg("strend(from)",(long) strend(from),(long) from+F_LEN);
  test_arg("strchr(v1,'M')",(long) strchr(v1,'M'),(long) v1);
  test_arg("strchr(v1,'y')",(long) strchr(v1,'y'),(long) v1+4);
@ -90,10 +89,10 @@ int main(void)
  test_strarg("bmove(to,from,4)",(bmove(to,from,4),0L),INT_MAX32,4,F_CHAR,
 	      0,0);
  test_strarg("bmove(to,from,0)",(bmove(to,from,0),0L),INT_MAX32,0,0);
-  test_strarg("bmove_upp(to+6,from+6,3)",(bmove_upp(to+6,from+6,3),0L),INT_MAX32,
+  test_strarg("bmove_upp(to+6,from+6,3)",(bmove_upp((uchar*) to+6, (uchar*) from+6,3),0L),INT_MAX32,
 	       3,T_CHAR,3,F_CHAR,0,0);
-  test_strarg("bmove_upp(to,from,0)",(bmove_upp(to,from,0),0L),INT_MAX32,0,0);
-  test_strarg("bmove_align(to,from,8)",(bmove_align(to,from,8),0L),INT_MAX32,
+  test_strarg("bmove_upp(to,from,0)",(bmove_upp((uchar*) to, (uchar*) from,0),0L),INT_MAX32,0,0);
+  test_strarg("bmove_align(to,from,8)",(bmove_align((uchar*) to, (uchar*) from,8),0L),INT_MAX32,
 	      8,F_CHAR,0,0);
  test_strarg("strappend(to,3,' ')",(strappend(to,3,' '),0L),INT_MAX32,
 	      3,T_CHAR,1,0,T_LEN-4,T_CHAR,1,0,0,0);
@ -124,7 +123,7 @@ int main(void)
  test_strarg("strxnmov(to,2,\"!!\",NullS)",strxnmov(to,2,"!!","xx",NullS),to+2,2,'!',0,0,0);
  test_strarg("strxnmov(to,2,\"!\",\"x\",\"y\",NullS)",strxnmov(to,2,"!","x","y",NullS),to+2,1,'!',1,'x',0,0,0);

-  test_strarg("bchange(to,2,from,4,6)",(bchange(to,2,from,4,6),0L),INT_MAX32,
+  test_strarg("bchange(to,2,from,4,6)",(bchange((uchar*) to,2,(uchar*) from,4,6),0L),INT_MAX32,
 	      4,F_CHAR,2,T_CHAR,0,0);

  printf("tests: %d  errors: %d\n",tests,errors);
@ -233,7 +232,7 @@ int compare_buff(const char *message, char * b1, char * b2, int length,
 {
  int i,error=0;

-  if (bcmp(b1,b2,length))
+  if (bcmp((uchar*) b1, (uchar*) b2, length))
  {
    errors++;
    printf("func: '%s'   Buffers differ\nIs:        ",message);
@ -259,19 +258,19 @@ int compare_buff(const char *message, char * b1, char * b2, int length,
  return error;
 } /* compare_buff */

-	/* These are here to be loaded and examined */
+	/* These are here to be loaded and examined in debugger */

 extern void dummy_functions(void);

 void dummy_functions(void)
 {
-  VOID(memchr(from,'a',5));
-  VOID(memcmp(from,to,5));
-  VOID(memcpy(from,to,5));
-  VOID(memset(from,' ',5));
-  VOID(strcmp(from,to));
-  VOID(strcpy(from,to));
-  VOID(strstr(from,to));
-  VOID(strrchr(from,'a'));
+  (void) memchr(from,'a',5);
+  (void) memcmp(from,to,5);
+  (void) memcpy(from,to,5);
+  (void) memset(from,' ',5);
+  (void) strcmp(from,to);
+  (void) strcpy(from,to);
+  (void) strstr(from,to);
+  (void) strrchr(from,'a');
  return;
 }
--- a/strings/strappend.c
+++ b/strings/strappend.c
@ -23,8 +23,7 @@
    trunked. The des+len character is allways set to NULL.
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"


 void strappend(register char *s, size_t len, pchar fill)
--- a/strings/strcend.c
+++ b/strings/strcend.c
@ -22,8 +22,7 @@
    occurs,  or a pointer to the end-null of s if c does not occur in s.
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 #if defined(MC68000) && defined(DS90)

--- a/strings/strcont.c
+++ b/strings/strcont.c
@ -24,8 +24,7 @@

 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 char * strcont(reg1 const char *str,reg2 const char *set)
 {
--- a/strings/strend.c
+++ b/strings/strend.c
@ -27,8 +27,7 @@
    Beware: the asm version works only if strlen(s) < 65535.
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 #if	VaxAsm

--- a/strings/strfill.c
+++ b/strings/strfill.c
@ -23,8 +23,7 @@
    strfill() returns pointer to dest+len;
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 char * strfill(char *s, size_t len, pchar fill)
 {
--- a/strings/strings_def.h
+++ b/strings/strings_def.h
@ -0,0 +1,31 @@
+/* Copyright (C) 2011 Monty Program 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 */
+
+/* This file is to be include first in all files in the string directory */
+
+#include <my_global.h>		/* Define standar vars */
+#include "m_string.h"		/* Exernal defintions of string functions */
+
+/*
+  We can't use the original DBUG_ASSERT() (which includes _db_flush())
+  in the strings library as libdbug is compiled after the the strings
+  library and we don't want to have strings depending on libdbug which
+  depends on mysys and strings.
+*/
+
+#if !defined(DBUG_OFF)
+#undef DBUG_ASSERT
+#define DBUG_ASSERT(A) assert(A)
+#endif
--- a/strings/strinstr.c
+++ b/strings/strinstr.c
@ -25,8 +25,7 @@
    char is 1.
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 size_t strinstr(reg1 const char *str,reg4 const char *search)
 {
--- a/strings/strmake.c
+++ b/strings/strmake.c
@ -24,8 +24,7 @@
    strmake() returns pointer to closing null
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 char *strmake(register char *dst, register const char *src, size_t length)
 {
--- a/strings/strmov.c
+++ b/strings/strmov.c
@ -21,8 +21,7 @@
  into dst, which seems useful.
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 #ifndef strmov

--- a/strings/strmov_overlapp.c
+++ b/strings/strmov_overlapp.c
@ -13,8 +13,7 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 /* A trivial implementation */
 char *strmov_overlapp(char *dst, const char *src)
--- a/strings/strnlen.c
+++ b/strings/strnlen.c
@ -20,8 +20,7 @@
    strnlen(s, len) returns the length of s or len if s is longer than len.
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 #ifndef HAVE_STRNLEN

--- a/strings/strnmov.c
+++ b/strings/strnmov.c
@ -20,8 +20,7 @@
    truncated.
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 char *strnmov(register char *dst, register const char *src, size_t n)
 {
--- a/strings/strstr.c
+++ b/strings/strstr.c
@ -27,8 +27,7 @@

 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 #ifndef HAVE_STRSTR

--- a/strings/strto.c
+++ b/strings/strto.c
@ -40,7 +40,7 @@
   /* see 'strtoll.c' and 'strtoull.c' for the reasons */
 #endif

-#include "m_ctype.h"
+#include <m_ctype.h>
 #include "my_sys.h"			/* defines errno */
 #include <errno.h>

--- a/strings/strtod.c
+++ b/strings/strtod.c
@ -27,7 +27,7 @@
 */

 #include "my_base.h"			/* Includes errno.h + EOVERFLOW */
-#include "m_ctype.h"
+#include <m_ctype.h>
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
 #endif
--- a/strings/strtol.c
+++ b/strings/strtol.c
@ -20,8 +20,7 @@
   functions, especially they handle tricks for Tru64 where 'long' is
   64 bit already and our 'longlong' is just a 'long'.
 */
-#include <my_global.h>
-#include <m_string.h>
+#include "strings_def.h"

 #if !defined(MSDOS) && !defined(HAVE_STRTOL) && !defined(__WIN__)
 #include "strto.c"
--- a/strings/strtoll.c
+++ b/strings/strtoll.c
@ -24,8 +24,7 @@
   for 'strtoll()' but no implementation, see "6.1 New C99 library functions" 
   in file '/usr/share/doclib/cc.dtk/release_notes.txt'.
 */
-#include <my_global.h>
-#include <m_string.h>
+#include "strings_def.h"

 #if !defined(HAVE_STRTOLL) && defined(HAVE_LONG_LONG)
 #define USE_LONGLONG
--- a/strings/strtoul.c
+++ b/strings/strtoul.c
@ -20,8 +20,7 @@
   functions, especially they handle tricks for Tru64 where 'long' is
   64 bit already and our 'longlong' is just a 'long'.
 */
-#include <my_global.h>
-#include <m_string.h>
+#include "strings_def.h"

 #if !defined(MSDOS) && !defined(HAVE_STRTOUL)
 #define USE_UNSIGNED
--- a/strings/strtoull.c
+++ b/strings/strtoull.c
@ -24,8 +24,7 @@
   for 'strtoull()' but no implementation, see "6.1 New C99 library functions" 
   in file '/usr/share/doclib/cc.dtk/release_notes.txt'.
 */
-#include <my_global.h>
-#include <m_string.h>
+#include "strings_def.h"

 #if !defined(HAVE_STRTOULL) && defined(HAVE_LONG_LONG)
 #define USE_UNSIGNED
--- a/strings/strxmov.c
+++ b/strings/strxmov.c
@ -30,8 +30,7 @@
    character pointer, or not the same bit pattern as NullS.
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"

 char *strxmov(char *dst,const char *src, ...)
 {
--- a/strings/strxnmov.c
+++ b/strings/strxnmov.c
@ -35,8 +35,7 @@
      if total-string-length >= length then dst[length] will be set to \0
 */

-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 #include <stdarg.h>

 char *strxnmov(char *dst, size_t len, const char *src, ...)
--- a/strings/uctypedump.c
+++ b/strings/uctypedump.c
@ -13,15 +13,8 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */

-/*
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-*/
-#include <my_global.h>
-#include <m_string.h>
+#include "strings_def.h"
 #include <m_ctype.h>
-#include "m_ctype.h"


 typedef struct my_ctype_name_st
@ -204,7 +197,7 @@ int main(int ac, char ** av)
      int charnum=0;
      int num=0;
      
-      printf("static unsigned char uctype_page%02X[256]=\n{\n",plane);
+      printf("static unsigned char uctype_page%02X[256]=\n{\n", (uint) plane);
      
      for(charnum=0;charnum<256;charnum++)
      {
@ -231,7 +224,7 @@ int main(int ac, char ** av)
  {
    char plane_name[128]="NULL";
    if(uctype[plane].ctype){
-      sprintf(plane_name,"uctype_page%02X",plane);
+      sprintf(plane_name,"uctype_page%02X",(uint) plane);
    }
    printf("\t{%d,%s}%s\n",uctype[plane].pctype,plane_name,plane<255?",":"");
  }
--- a/strings/udiv.c
+++ b/strings/udiv.c
@ -15,7 +15,7 @@

 /* Do udiv and urem if machine dosn't have it */

-#include <my_global.h>
+#include "strings_def.h"
 #include <math.h>

 unsigned long udiv(long unsigned int a, long unsigned int b)
--- a/strings/xml.c
+++ b/strings/xml.c
@ -14,7 +14,6 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

 #include "my_global.h"
-#include "m_string.h"
 #include "my_xml.h"