diff options
| author | monty@mishka.local <> | 2004-10-20 01:28:42 +0300 |
|---|---|---|
| committer | monty@mishka.local <> | 2004-10-20 01:28:42 +0300 |
| commit | 04c23808a856bd8c4425d52419592d58d9bc5f35 (patch) | |
| tree | 1919e7f3a6a68e36dbbcf1dd8b6cd8729a975e36 /strings | |
| parent | 57a85986ac46550dcf7ced4cb50111efe2a6e0ad (diff) | |
| download | mariadb-git-04c23808a856bd8c4425d52419592d58d9bc5f35.tar.gz | |
Review of all code pushed since last review
Simple optimzations and cleanups
Removed compiler warnings and fixed portability issues
Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
Fixes for purify
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/Makefile.am | 2 | ||||
| -rw-r--r-- | strings/xml.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/strings/Makefile.am b/strings/Makefile.am index be51e48ef8d..d17a4f598a6 100644 --- a/strings/Makefile.am +++ b/strings/Makefile.am @@ -57,7 +57,7 @@ EXTRA_DIST = ctype-big5.c ctype-czech.c ctype-euc_kr.c ctype-win1250ch.c \ t_ctype.h libmystrings_a_LIBADD= -conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c +conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c bcmp.c conf_to_src_LDADD= #force static linking of conf_to_src - essential when linking against #custom installation of libc diff --git a/strings/xml.c b/strings/xml.c index 7d7839e1603..6ba52ea41a8 100644 --- a/strings/xml.c +++ b/strings/xml.c @@ -81,10 +81,11 @@ static int my_xml_scan(MY_XML_PARSER *p,MY_XML_ATTR *a) a->beg=p->cur; a->end=p->cur; - if (!memcmp(p->cur,"<!--",4)) + if (!bcmp(p->cur,"<!--",4)) { - for( ; (p->cur < p->end) && memcmp(p->cur, "-->", 3); p->cur++); - if(!memcmp(p->cur, "-->", 3)) + for( ; (p->cur < p->end) && bcmp(p->cur, "-->", 3); p->cur++) + {} + if (!bcmp(p->cur, "-->", 3)) p->cur+=3; a->end=p->cur; lex=MY_XML_COMMENT; |