remove xstrncat and define xstrcat

diff --git a/src/regerror.c b/src/regerror.c
index ca17e1d1489c1f333e648c1d28dbea0b46ea21e3..a36c5bfcebc031d1d40ed6c58933d88816e39ef6 100644 (file)
--- a/src/regerror.c
+++ b/src/regerror.c
@@ -339,7 +339,7 @@ onig_snprintf_with_pattern(buf, bufsize, enc, pat, pat_end, fmt, va_alist)
   need = (pat_end - pat) * 4 + 4;
 
   if (n + need < bufsize) {
-    xstrncat((char* )buf, ": /", bufsize);
+    xstrcat((char* )buf, ": /", bufsize);
     s = buf + onigenc_str_bytelen_null(ONIG_ENCODING_ASCII, buf);
 
     p = pat;

diff --git a/src/regint.h b/src/regint.h
index daecf70e87503e6607d51525e0ce5fc9b4e9a18b..5476626d83301daa1faeec0fa0f4ec4c72c4de09 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -130,12 +130,12 @@
 #define xalloca     _alloca
 #define xvsnprintf(buf,size,fmt,args)  _vsnprintf_s(buf,size,_TRUNCATE,fmt,args)
 #define xsnprintf   sprintf_s
-#define xstrncat(dest,src,n)   strcat_s(dest,n,src)
+#define xstrcat(dest,src,size)   strcat_s(dest,size,src)
 #else
 #define xalloca     alloca
 #define xvsnprintf  vsnprintf
 #define xsnprintf   snprintf
-#define xstrncat(dest,src,n)   strncat(dest,src,n)
+#define xstrcat(dest,src,size)   strcat(dest,src)
 #endif