Moriyoshi Koizumi
moriy****@users*****
2002年 12月 25日 (水) 03:00:12 JST
moriyoshi 02/12/25 03:00:12
Modified: . configure.in
mbfl mbfilter.c mbfilter.h mbfilter_8bit.c
mbfilter_pass.c mbfilter_wchar.c mbfl_allocators.c
mbfl_allocators.h mbfl_buffer_converter.c
mbfl_convert.c mbfl_encoding.c mbfl_ident.c
mbfl_language.c mbfl_memory_device.c mbfl_string.c
Log:
Added mbfl_buffer_converter_dtor()
Added more check for header files
Revision Changes Path
1.3 +6 -1 libmbfl/configure.in
Index: configure.in
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure.in 9 Dec 2002 02:52:57 -0000 1.2
+++ configure.in 24 Dec 2002 18:00:11 -0000 1.3
@@ -6,18 +6,23 @@
# Checks for programs.
AC_PROG_CC
+AC_PROG_CXX
AC_PROG_LIBTOOL
+AC_PROG_RANLIB
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS([stdlib.h])
+AC_CHECK_HEADERS([stdlib.h stddef.h assert.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
+AC_TYPE_SIZE_T
# Checks for library functions.
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
AC_CHECK_FUNCS([strcasecmp strchr])
AC_CONFIG_FILES([Makefile mbfl/Makefile filters/Makefile nls/Makefile])
1.14 +4 -0 libmbfl/mbfl/mbfilter.c
Index: mbfilter.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfilter.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mbfilter.c 24 Dec 2002 17:32:14 -0000 1.13
+++ mbfilter.c 24 Dec 2002 18:00:11 -0000 1.14
@@ -95,6 +95,10 @@
#include <strings.h>
#endif
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
#include "mbfilter.h"
#include "mbfl_filter_output.h"
#include "mbfilter_pass.h"
1.10 +0 -2 libmbfl/mbfl/mbfilter.h
Index: mbfilter.h
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfilter.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mbfilter.h 24 Dec 2002 17:32:14 -0000 1.9
+++ mbfilter.h 24 Dec 2002 18:00:11 -0000 1.10
@@ -89,8 +89,6 @@
#ifndef MBFL_MBFILTER_H
#define MBFL_MBFILTER_H
-#include <stddef.h>
-
#include "mbfl_consts.h"
#include "mbfl_allocators.h"
#include "mbfl_encoding.h"
1.4 +8 -0 libmbfl/mbfl/mbfilter_8bit.c
Index: mbfilter_8bit.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfilter_8bit.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mbfilter_8bit.c 20 Dec 2002 22:15:38 -0000 1.3
+++ mbfilter_8bit.c 24 Dec 2002 18:00:11 -0000 1.4
@@ -28,6 +28,14 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
#include "mbfilter.h"
const mbfl_encoding mbfl_encoding_8bit = {
1.5 +4 -0 libmbfl/mbfl/mbfilter_pass.c
Index: mbfilter_pass.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfilter_pass.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mbfilter_pass.c 20 Dec 2002 22:15:38 -0000 1.4
+++ mbfilter_pass.c 24 Dec 2002 18:00:11 -0000 1.5
@@ -31,6 +31,10 @@
#include "config.h"
#endif
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
#include "mbfilter.h"
#include "mbfilter_pass.h"
1.4 +12 -4 libmbfl/mbfl/mbfilter_wchar.c
Index: mbfilter_wchar.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfilter_wchar.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mbfilter_wchar.c 20 Dec 2002 22:15:38 -0000 1.3
+++ mbfilter_wchar.c 24 Dec 2002 18:00:11 -0000 1.4
@@ -28,16 +28,24 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
#include "mbfilter.h"
const mbfl_encoding mbfl_encoding_wchar = {
mbfl_encoding_id_wchar,
"wchar",
- NULL,
- NULL,
- NULL,
+ 0,
+ 0,
+ 0,
MBFL_ENCTYPE_WCS4BE,
- NULL
+ 0
};
1.2 +18 -6 libmbfl/mbfl/mbfl_allocators.c
Index: mbfl_allocators.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_allocators.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mbfl_allocators.c 20 Dec 2002 19:36:28 -0000 1.1
+++ mbfl_allocators.c 24 Dec 2002 18:00:11 -0000 1.2
@@ -40,11 +40,23 @@
#include <memory.h>
#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
#include "mbfl_allocators.h"
-static void *__mbfl__malloc(size_t);
-static void *__mbfl__realloc(void *, size_t);
-static void *__mbfl__calloc(unsigned int, size_t);
+static void *__mbfl__malloc(unsigned int);
+static void *__mbfl__realloc(void *, unsigned int);
+static void *__mbfl__calloc(unsigned int, unsigned int);
static void __mbfl__free(void *);
static mbfl_allocators default_allocators = {
@@ -59,17 +71,17 @@
mbfl_allocators *__mbfl_allocators = &default_allocators;
-static void *__mbfl__malloc(size_t sz)
+static void *__mbfl__malloc(unsigned int sz)
{
return malloc(sz);
}
-static void *__mbfl__realloc(void *ptr, size_t sz)
+static void *__mbfl__realloc(void *ptr, unsigned int sz)
{
return realloc(ptr, sz);
}
-static void *__mbfl__calloc(unsigned int nelems, size_t szelem)
+static void *__mbfl__calloc(unsigned int nelems, unsigned int szelem)
{
return calloc(nelems, szelem);
}
1.2 +5 -7 libmbfl/mbfl/mbfl_allocators.h
Index: mbfl_allocators.h
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_allocators.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mbfl_allocators.h 20 Dec 2002 19:36:28 -0000 1.1
+++ mbfl_allocators.h 24 Dec 2002 18:00:11 -0000 1.2
@@ -31,15 +31,13 @@
#ifndef MBFL_ALLOCATORS_H
#define MBFL_ALLOCATORS_H
-#include <stddef.h>
-
typedef struct _mbfl_allocators {
- void *(*malloc)(size_t);
- void *(*realloc)(void *, size_t);
- void *(*calloc)(unsigned int, size_t);
+ void *(*malloc)(unsigned int);
+ void *(*realloc)(void *, unsigned int);
+ void *(*calloc)(unsigned int, unsigned int);
void (*free)(void *);
- void *(*pmalloc)(size_t);
- void *(*prealloc)(void *, size_t);
+ void *(*pmalloc)(unsigned int);
+ void *(*prealloc)(void *, unsigned int);
void (*pfree)(void *);
} mbfl_allocators;
1.3 +19 -10 libmbfl/mbfl/mbfl_buffer_converter.c
Index: mbfl_buffer_converter.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_buffer_converter.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mbfl_buffer_converter.c 24 Dec 2002 17:41:54 -0000 1.2
+++ mbfl_buffer_converter.c 24 Dec 2002 18:00:11 -0000 1.3
@@ -32,7 +32,11 @@
#include "config.h"
#endif
+#ifdef HAVE_STDDEF_H
#include <stddef.h>
+#endif
+
+#include <assert.h>
#include "mbfl_allocators.h"
#include "mbfl_buffer_converter.h"
@@ -93,18 +97,23 @@
return convd;
}
-void mbfl_buffer_converter_delete(mbfl_buffer_converter *convd)
+void mbfl_buffer_converter_dtor(mbfl_buffer_converter *convd)
{
- if (convd != NULL) {
- if (convd->filter1) {
- mbfl_convert_filter_delete(convd->filter1);
- }
- if (convd->filter2) {
- mbfl_convert_filter_delete(convd->filter2);
- }
- mbfl_memory_device_clear(&convd->device);
- mbfl_free((void*)convd);
+ assert(convd);
+
+ if (convd->filter1 != NULL) {
+ mbfl_convert_filter_delete(convd->filter1);
}
+ if (convd->filter2 != NULL) {
+ mbfl_convert_filter_delete(convd->filter2);
+ }
+ mbfl_memory_device_clear(&convd->device);
+}
+
+void mbfl_buffer_converter_delete(mbfl_buffer_converter *convd)
+{
+ mbfl_buffer_converter_delete(convd);
+ mbfl_free((void*)convd);
}
void mbfl_buffer_converter_reset(mbfl_buffer_converter *convd)
1.5 +4 -0 libmbfl/mbfl/mbfl_convert.c
Index: mbfl_convert.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_convert.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mbfl_convert.c 20 Dec 2002 20:30:34 -0000 1.4
+++ mbfl_convert.c 24 Dec 2002 18:00:11 -0000 1.5
@@ -32,6 +32,10 @@
#include "config.h"
#endif
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
#include "mbfl_encoding.h"
#include "mbfl_allocators.h"
#include "mbfl_filter_output.h"
1.4 +4 -0 libmbfl/mbfl/mbfl_encoding.c
Index: mbfl_encoding.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_encoding.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mbfl_encoding.c 20 Dec 2002 20:30:34 -0000 1.3
+++ mbfl_encoding.c 24 Dec 2002 18:00:11 -0000 1.4
@@ -32,6 +32,10 @@
#include "config.h"
#endif
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
#include "mbfl_encoding.h"
#include "mbfilter_pass.h"
#include "mbfilter_8bit.h"
1.5 +2 -0 libmbfl/mbfl/mbfl_ident.c
Index: mbfl_ident.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_ident.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mbfl_ident.c 20 Dec 2002 22:15:38 -0000 1.4
+++ mbfl_ident.c 24 Dec 2002 18:00:11 -0000 1.5
@@ -32,7 +32,9 @@
#include "config.h"
#endif
+#ifdef HAVE_STDDEF_H
#include <stddef.h>
+#endif
#include "mbfl_ident.h"
#include "mbfl_allocators.h"
1.4 +4 -0 libmbfl/mbfl/mbfl_language.c
Index: mbfl_language.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_language.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mbfl_language.c 20 Dec 2002 20:30:34 -0000 1.3
+++ mbfl_language.c 24 Dec 2002 18:00:11 -0000 1.4
@@ -32,6 +32,10 @@
#include "config.h"
#endif
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
#include "mbfl_encoding.h"
#include "mbfl_language.h"
1.4 +2 -0 libmbfl/mbfl/mbfl_memory_device.c
Index: mbfl_memory_device.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_memory_device.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mbfl_memory_device.c 20 Dec 2002 22:15:38 -0000 1.3
+++ mbfl_memory_device.c 24 Dec 2002 18:00:11 -0000 1.4
@@ -32,7 +32,9 @@
#include "config.h"
#endif
+#ifdef HAVE_STDDEF_H
#include <stddef.h>
+#endif
#include "mbfl_allocators.h"
#include "mbfl_string.h"
1.4 +2 -0 libmbfl/mbfl/mbfl_string.c
Index: mbfl_string.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_string.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mbfl_string.c 20 Dec 2002 22:28:13 -0000 1.3
+++ mbfl_string.c 24 Dec 2002 18:00:11 -0000 1.4
@@ -32,7 +32,9 @@
#include "config.h"
#endif
+#ifdef HAVE_STDDEF_H
#include <stddef.h>
+#endif
#include "mbfl_allocators.h"
#include "mbfl_string.h"