Moriyoshi Koizumi
moriy****@users*****
2002年 12月 27日 (金) 08:43:09 JST
moriyoshi 02/12/27 08:43:09
Modified: mbfl mbfl_memory_device.c mbfl_wchar_device.c
Log:
Use assert()
Revision Changes Path
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mbfl_memory_device.c 26 Dec 2002 23:39:40 -0000 1.6
+++ mbfl_memory_device.c 26 Dec 2002 23:43:09 -0000 1.7
@@ -36,6 +36,8 @@
#include <stddef.h>
#endif
+#include <assert.h>
+
#include "mbfl_allocators.h"
#include "mbfl_string.h"
#include "mbfl_memory_device.h"
1.2 +15 -13 libmbfl/mbfl/mbfl_wchar_device.c
Index: mbfl_wchar_device.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_wchar_device.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mbfl_wchar_device.c 26 Dec 2002 23:41:48 -0000 1.1
+++ mbfl_wchar_device.c 26 Dec 2002 23:43:09 -0000 1.2
@@ -36,30 +36,32 @@
#include <stddef.h>
#endif
+#include <assert.h>
+
#include "mbfl_allocators.h"
#include "mbfl_string.h"
#include "mbfl_wchar_device.h"
void mbfl_wchar_device_ctor(mbfl_wchar_device *device)
{
- if (device) {
- device->buffer = (unsigned int *)0;
- device->length = 0;
- device->pos= 0;
- device->allocsz = MBFL_MEMORY_DEVICE_ALLOC_SIZE;
- }
+ assert(device != NULL);
+
+ device->buffer = (unsigned int *)0;
+ device->length = 0;
+ device->pos= 0;
+ device->allocsz = MBFL_MEMORY_DEVICE_ALLOC_SIZE;
}
void mbfl_wchar_device_dtor(mbfl_wchar_device *device)
{
- if (device) {
- if (device->buffer) {
- mbfl_free(device->buffer);
- }
- device->buffer = (unsigned int*)0;
- device->length = 0;
- device->pos = 0;
+ assert(device != NULL);
+
+ if (device->buffer) {
+ mbfl_free(device->buffer);
}
+ device->buffer = (unsigned int*)0;
+ device->length = 0;
+ device->pos = 0;
}
int mbfl_wchar_device_output(int c, void *data)