Moriyoshi Koizumi
moriy****@users*****
2002年 12月 21日 (土) 05:11:49 JST
moriyoshi 02/12/21 05:11:49
Modified: mbfl mbfilter.c mbfl_convert.c mbfl_encoding.c
mbfl_language.c mbfl_memory_device.c
Log:
Changed wrapping style
Revision Changes Path
1.10 +48 -142 libmbfl/mbfl/mbfilter.c
Index: mbfilter.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfilter.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mbfilter.c 20 Dec 2002 20:01:19 -0000 1.9
+++ mbfilter.c 20 Dec 2002 20:11:48 -0000 1.10
@@ -115,11 +115,7 @@
/*
* buffering converter
*/
-mbfl_buffer_converter *
-mbfl_buffer_converter_new(
- enum mbfl_no_encoding from,
- enum mbfl_no_encoding to,
- int buf_initsz)
+mbfl_buffer_converter * mbfl_buffer_converter_new(enum mbfl_no_encoding from, enum mbfl_no_encoding to, int buf_initsz)
{
mbfl_buffer_converter *convd;
@@ -162,8 +158,7 @@
return convd;
}
-void
-mbfl_buffer_converter_delete(mbfl_buffer_converter *convd)
+void mbfl_buffer_converter_delete(mbfl_buffer_converter *convd)
{
if (convd != NULL) {
if (convd->filter1) {
@@ -177,14 +172,12 @@
}
}
-void
-mbfl_buffer_converter_reset(mbfl_buffer_converter *convd)
+void mbfl_buffer_converter_reset(mbfl_buffer_converter *convd)
{
mbfl_memory_device_reset(&convd->device);
}
-int
-mbfl_buffer_converter_illegal_mode(mbfl_buffer_converter *convd, int mode)
+int mbfl_buffer_converter_illegal_mode(mbfl_buffer_converter *convd, int mode)
{
if (convd != NULL) {
if (convd->filter2 != NULL) {
@@ -199,8 +192,7 @@
return 1;
}
-int
-mbfl_buffer_converter_illegal_substchar(mbfl_buffer_converter *convd, int substchar)
+int mbfl_buffer_converter_illegal_substchar(mbfl_buffer_converter *convd, int substchar)
{
if (convd != NULL) {
if (convd->filter2 != NULL) {
@@ -215,8 +207,7 @@
return 1;
}
-int
-mbfl_buffer_converter_strncat(mbfl_buffer_converter *convd, const unsigned char *p, int n)
+int mbfl_buffer_converter_strncat(mbfl_buffer_converter *convd, const unsigned char *p, int n)
{
mbfl_convert_filter *filter;
int (*filter_function)(int c, mbfl_convert_filter *filter);
@@ -237,8 +228,7 @@
return n;
}
-int
-mbfl_buffer_converter_feed(mbfl_buffer_converter *convd, mbfl_string *string)
+int mbfl_buffer_converter_feed(mbfl_buffer_converter *convd, mbfl_string *string)
{
int n;
unsigned char *p;
@@ -266,8 +256,7 @@
return 0;
}
-int
-mbfl_buffer_converter_flush(mbfl_buffer_converter *convd)
+int mbfl_buffer_converter_flush(mbfl_buffer_converter *convd)
{
if (convd == NULL) {
return -1;
@@ -283,8 +272,7 @@
return 0;
}
-mbfl_string *
-mbfl_buffer_converter_getbuffer(mbfl_buffer_converter *convd, mbfl_string *result)
+mbfl_string * mbfl_buffer_converter_getbuffer(mbfl_buffer_converter *convd, mbfl_string *result)
{
if (convd != NULL && result != NULL && convd->device.buffer != NULL) {
result->no_encoding = convd->to->no_encoding;
@@ -297,8 +285,7 @@
return result;
}
-mbfl_string *
-mbfl_buffer_converter_result(mbfl_buffer_converter *convd, mbfl_string *result)
+mbfl_string * mbfl_buffer_converter_result(mbfl_buffer_converter *convd, mbfl_string *result)
{
if (convd == NULL || result == NULL) {
return NULL;
@@ -307,8 +294,7 @@
return mbfl_memory_device_result(&convd->device, result);
}
-mbfl_string *
-mbfl_buffer_converter_feed_result(mbfl_buffer_converter *convd, mbfl_string *string,
+mbfl_string * mbfl_buffer_converter_feed_result(mbfl_buffer_converter *convd, mbfl_string *string,
mbfl_string *result)
{
if (convd == NULL || string == NULL || result == NULL) {
@@ -329,8 +315,7 @@
/*
* encoding detector
*/
-mbfl_encoding_detector *
-mbfl_encoding_detector_new(enum mbfl_no_encoding *elist, int eliztsz)
+mbfl_encoding_detector * mbfl_encoding_detector_new(enum mbfl_no_encoding *elist, int eliztsz)
{
mbfl_encoding_detector *identd;
@@ -368,8 +353,7 @@
return identd;
}
-void
-mbfl_encoding_detector_delete(mbfl_encoding_detector *identd)
+void mbfl_encoding_detector_delete(mbfl_encoding_detector *identd)
{
int i;
@@ -386,8 +370,7 @@
}
}
-int
-mbfl_encoding_detector_feed(mbfl_encoding_detector *identd, mbfl_string *string)
+int mbfl_encoding_detector_feed(mbfl_encoding_detector *identd, mbfl_string *string)
{
int i, n, num, bad, res;
unsigned char *p;
@@ -448,11 +431,7 @@
/*
* encoding converter
*/
-mbfl_string *
-mbfl_convert_encoding(
- mbfl_string *string,
- mbfl_string *result,
- enum mbfl_no_encoding toenc)
+mbfl_string * mbfl_convert_encoding(mbfl_string *string, mbfl_string *result, enum mbfl_no_encoding toenc)
{
int n;
unsigned char *p;
@@ -513,8 +492,7 @@
/*
* identify encoding
*/
-const mbfl_encoding *
-mbfl_identify_encoding(mbfl_string *string, enum mbfl_no_encoding *elist, int eliztsz)
+const mbfl_encoding * mbfl_identify_encoding(mbfl_string *string, enum mbfl_no_encoding *elist, int eliztsz)
{
int i, n, num, bad;
unsigned char *p;
@@ -596,8 +574,7 @@
return encoding;
}
-const char*
-mbfl_identify_encoding_name(mbfl_string *string, enum mbfl_no_encoding *elist, int eliztsz)
+const char* mbfl_identify_encoding_name(mbfl_string *string, enum mbfl_no_encoding *elist, int eliztsz)
{
const mbfl_encoding *encoding;
@@ -611,8 +588,7 @@
}
}
-const enum mbfl_no_encoding
-mbfl_identify_encoding_no(mbfl_string *string, enum mbfl_no_encoding *elist, int eliztsz)
+const enum mbfl_no_encoding mbfl_identify_encoding_no(mbfl_string *string, enum mbfl_no_encoding *elist, int eliztsz)
{
const mbfl_encoding *encoding;
@@ -630,15 +606,13 @@
/*
* strlen
*/
-static int
-filter_count_output(int c, void *data)
+static int filter_count_output(int c, void *data)
{
(*(int *)data)++;
return c;
}
-int
-mbfl_strlen(mbfl_string *string)
+int mbfl_strlen(mbfl_string *string)
{
int len, n, m, k;
unsigned char *p;
@@ -710,8 +684,7 @@
int matched_pos;
};
-static int
-collector_strpos(int c, void* data)
+static int collector_strpos(int c, void* data)
{
int *p, *h, *m, n;
struct collector_strpos_data *pc = (struct collector_strpos_data*)data;
@@ -758,12 +731,7 @@
return c;
}
-int
-mbfl_strpos(
- mbfl_string *haystack,
- mbfl_string *needle,
- int offset,
- int reverse)
+int mbfl_strpos(mbfl_string *haystack, mbfl_string *needle, int offset, int reverse)
{
int n, result;
unsigned char *p;
@@ -844,11 +812,7 @@
* substr_count
*/
-int
-mbfl_substr_count(
- mbfl_string *haystack,
- mbfl_string *needle
- )
+int mbfl_substr_count(mbfl_string *haystack, mbfl_string *needle)
{
int n, result = 0;
unsigned char *p;
@@ -935,8 +899,7 @@
int output;
};
-static int
-collector_substr(int c, void* data)
+static int collector_substr(int c, void* data)
{
struct collector_substr_data *pc = (struct collector_substr_data*)data;
@@ -953,12 +916,7 @@
return c;
}
-mbfl_string *
-mbfl_substr(
- mbfl_string *string,
- mbfl_string *result,
- int from,
- int length)
+mbfl_string *mbfl_substr(mbfl_string *string, mbfl_string *result, int from, int length)
{
const mbfl_encoding *encoding;
int n, m, k, len, start, end;
@@ -1112,12 +1070,7 @@
/*
* strcut
*/
-mbfl_string *
-mbfl_strcut(
- mbfl_string *string,
- mbfl_string *result,
- int from,
- int length)
+mbfl_string * mbfl_strcut(mbfl_string *string, mbfl_string *result, int from, int length)
{
const mbfl_encoding *encoding;
int n, m, k, len, start, end;
@@ -1306,8 +1259,7 @@
/*
* strwidth
*/
-static int
-filter_count_width(int c, void* data)
+static int filter_count_width(int c, void* data)
{
if (c >= 0x20) {
if (c < 0x2000 || (c > 0xff60 && c < 0xffa0)) {
@@ -1320,8 +1272,7 @@
return c;
}
-int
-mbfl_strwidth(mbfl_string *string)
+int mbfl_strwidth(mbfl_string *string)
{
int len, n;
unsigned char *p;
@@ -1370,8 +1321,7 @@
int endpos;
};
-static int
-collector_strimwidth(int c, void* data)
+static int collector_strimwidth(int c, void* data)
{
struct collector_strimwidth_data *pc = (struct collector_strimwidth_data*)data;
@@ -1407,13 +1357,7 @@
return c;
}
-mbfl_string *
-mbfl_strimwidth(
- mbfl_string *string,
- mbfl_string *marker,
- mbfl_string *result,
- int from,
- int width)
+mbfl_string * mbfl_strimwidth(mbfl_string *string, mbfl_string *marker, mbfl_string *result, int from, int width)
{
struct collector_strimwidth_data pc;
mbfl_convert_filter *encoder;
@@ -1558,8 +1502,7 @@
{0x74,0x00},{0x66,0x00},{0x9D,0x00},{0x73,0x9E}
};
-static int
-collector_hantozen(int c, void* data)
+static int collector_hantozen(int c, void* data)
{
int s, mode, n;
struct collector_hantozen_data *pc = (struct collector_hantozen_data*)data;
@@ -1759,8 +1702,7 @@
return (*pc->next_filter->filter_function)(s, pc->next_filter);
}
-static int
-collector_hantozen_flush(struct collector_hantozen_data *pc)
+static int collector_hantozen_flush(struct collector_hantozen_data *pc)
{
int ret, n;
@@ -1778,11 +1720,7 @@
return ret;
}
-mbfl_string *
-mbfl_ja_jp_hantozen(
- mbfl_string *string,
- mbfl_string *result,
- int mode)
+mbfl_string *mbfl_ja_jp_hantozen(mbfl_string *string, mbfl_string *result, int mode)
{
int n;
unsigned char *p;
@@ -1868,8 +1806,7 @@
char lwsp[16];
};
-static int
-mime_header_encoder_block_collector(int c, void *data)
+static int mime_header_encoder_block_collector(int c, void *data)
{
int n;
struct mime_header_encoder_data *pe = (struct mime_header_encoder_data *)data;
@@ -1910,8 +1847,7 @@
return c;
}
-static int
-mime_header_encoder_collector(int c, void *data)
+static int mime_header_encoder_collector(int c, void *data)
{
int n;
struct mime_header_encoder_data *pe = (struct mime_header_encoder_data *)data;
@@ -1961,8 +1897,7 @@
return c;
}
-mbfl_string *
-mime_header_encoder_result(struct mime_header_encoder_data *pe, mbfl_string *result)
+mbfl_string * mime_header_encoder_result(struct mime_header_encoder_data *pe, mbfl_string *result)
{
if (pe->status1 >= 10) {
(*pe->conv2_filter->filter_flush)(pe->conv2_filter);
@@ -1987,11 +1922,7 @@
return mbfl_memory_device_result(&pe->outdev, result);
}
-struct mime_header_encoder_data*
-mime_header_encoder_new(
- enum mbfl_no_encoding incode,
- enum mbfl_no_encoding outcode,
- enum mbfl_no_encoding transenc)
+struct mime_header_encoder_data* mime_header_encoder_new(enum mbfl_no_encoding incode, enum mbfl_no_encoding outcode, enum mbfl_no_encoding transenc)
{
int n;
const char *s;
@@ -2077,8 +2008,7 @@
return pe;
}
-void
-mime_header_encoder_delete(struct mime_header_encoder_data *pe)
+void mime_header_encoder_delete(struct mime_header_encoder_data *pe)
{
if (pe) {
mbfl_convert_filter_delete(pe->conv1_filter);
@@ -2093,20 +2023,12 @@
}
}
-int
-mime_header_encoder_feed(int c, struct mime_header_encoder_data *pe)
+int mime_header_encoder_feed(int c, struct mime_header_encoder_data *pe)
{
return (*pe->conv1_filter->filter_function)(c, pe->conv1_filter);
}
-mbfl_string *
-mbfl_mime_header_encode(
- mbfl_string *string,
- mbfl_string *result,
- enum mbfl_no_encoding outcode,
- enum mbfl_no_encoding encoding,
- const char *linefeed,
- int indent)
+mbfl_string *mbfl_mime_header_encode(mbfl_string *string, mbfl_string *result, enum mbfl_no_encoding outcode, enum mbfl_no_encoding encoding, const char *linefeed, int indent)
{
int n;
unsigned char *p;
@@ -2164,8 +2086,7 @@
enum mbfl_no_encoding outcode;
};
-static int
-mime_header_decoder_collector(int c, void* data)
+static int mime_header_decoder_collector(int c, void* data)
{
const mbfl_encoding *encoding;
struct mime_header_decoder_data *pd = (struct mime_header_decoder_data*)data;
@@ -2323,8 +2244,7 @@
return c;
}
-mbfl_string *
-mime_header_decoder_result(struct mime_header_decoder_data *pd, mbfl_string *result)
+mbfl_string *mime_header_decoder_result(struct mime_header_decoder_data *pd, mbfl_string *result)
{
switch (pd->status) {
case 1:
@@ -2349,8 +2269,7 @@
return mbfl_memory_device_result(&pd->outdev, result);
}
-struct mime_header_decoder_data*
-mime_header_decoder_new(enum mbfl_no_encoding outcode)
+struct mime_header_decoder_data *mime_header_decoder_new(enum mbfl_no_encoding outcode)
{
struct mime_header_decoder_data *pd;
@@ -2393,17 +2312,12 @@
}
}
-int
-mime_header_decoder_feed(int c, struct mime_header_decoder_data *pd)
+int mime_header_decoder_feed(int c, struct mime_header_decoder_data *pd)
{
return mime_header_decoder_collector(c, pd);
}
-mbfl_string *
-mbfl_mime_header_decode(
- mbfl_string *string,
- mbfl_string *result,
- enum mbfl_no_encoding outcode)
+mbfl_string * mbfl_mime_header_decode(mbfl_string *string, mbfl_string *result, enum mbfl_no_encoding outcode)
{
int n;
unsigned char *p;
@@ -2446,8 +2360,7 @@
int mapsize;
};
-static int
-collector_encode_htmlnumericentity(int c, void *data)
+static int collector_encode_htmlnumericentity(int c, void *data)
{
struct collector_htmlnumericentity_data *pc = (struct collector_htmlnumericentity_data *)data;
int f, n, s, r, d, size, *mapelm;
@@ -2492,8 +2405,7 @@
return c;
}
-static int
-collector_decode_htmlnumericentity(int c, void *data)
+static int collector_decode_htmlnumericentity(int c, void *data)
{
struct collector_htmlnumericentity_data *pc = (struct collector_htmlnumericentity_data *)data;
int f, n, s, r, d, size, *mapelm;
@@ -2585,13 +2497,7 @@
return c;
}
-mbfl_string *
-mbfl_html_numeric_entity(
- mbfl_string *string,
- mbfl_string *result,
- int *convmap,
- int mapsize,
- int type)
+mbfl_string *mbfl_html_numeric_entity(mbfl_string *string, mbfl_string *result, int *convmap, int mapsize, int type)
{
struct collector_htmlnumericentity_data pc;
mbfl_memory_device device;
1.3 +7 -19 libmbfl/mbfl/mbfl_convert.c
Index: mbfl_convert.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_convert.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mbfl_convert.c 20 Dec 2002 20:01:19 -0000 1.2
+++ mbfl_convert.c 20 Dec 2002 20:11:48 -0000 1.3
@@ -206,8 +206,7 @@
NULL
};
-mbfl_convert_filter *
-mbfl_convert_filter_new(
+mbfl_convert_filter * mbfl_convert_filter_new(
enum mbfl_no_encoding from,
enum mbfl_no_encoding to,
int (*output_function)(int, void* ),
@@ -251,8 +250,7 @@
return filter;
}
-void
-mbfl_convert_filter_delete(mbfl_convert_filter *filter)
+void mbfl_convert_filter_delete(mbfl_convert_filter *filter)
{
if (filter) {
(*filter->filter_dtor)(filter);
@@ -260,24 +258,18 @@
}
}
-int
-mbfl_convert_filter_feed(int c, mbfl_convert_filter *filter)
+int mbfl_convert_filter_feed(int c, mbfl_convert_filter *filter)
{
return (*filter->filter_function)(c, filter);
}
-int
-mbfl_convert_filter_flush(mbfl_convert_filter *filter)
+int mbfl_convert_filter_flush(mbfl_convert_filter *filter)
{
(*filter->filter_flush)(filter);
return (filter->flush_function ? (*filter->flush_function)(filter->data) : 0);
}
-void
-mbfl_convert_filter_reset(
- mbfl_convert_filter *filter,
- enum mbfl_no_encoding from,
- enum mbfl_no_encoding to)
+void mbfl_convert_filter_reset(mbfl_convert_filter *filter, enum mbfl_no_encoding from, enum mbfl_no_encoding to)
{
/* destruct old filter */
(*filter->filter_dtor)(filter);
@@ -293,10 +285,7 @@
(*filter->filter_ctor)(filter);
}
-void
-mbfl_convert_filter_copy(
- mbfl_convert_filter *src,
- mbfl_convert_filter *dist)
+void mbfl_convert_filter_copy(mbfl_convert_filter *src, mbfl_convert_filter *dist)
{
dist->filter_ctor = src->filter_ctor;
dist->filter_dtor = src->filter_dtor;
@@ -360,8 +349,7 @@
#endif
/* illegal character output function for conv-filter */
-int
-mbfl_filt_conv_illegal_output(int c, mbfl_convert_filter *filter)
+int mbfl_filt_conv_illegal_output(int c, mbfl_convert_filter *filter)
{
int mode_backup, ret, n, m, r;
1.2 +6 -12 libmbfl/mbfl/mbfl_encoding.c
Index: mbfl_encoding.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_encoding.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mbfl_encoding.c 20 Dec 2002 19:36:28 -0000 1.1
+++ mbfl_encoding.c 20 Dec 2002 20:11:48 -0000 1.2
@@ -159,8 +159,7 @@
};
/* encoding resolver */
-const mbfl_encoding *
-mbfl_name2encoding(const char *name)
+const mbfl_encoding *mbfl_name2encoding(const char *name)
{
const mbfl_encoding *encoding;
int i, j;
@@ -203,8 +202,7 @@
return NULL;
}
-const mbfl_encoding *
-mbfl_no2encoding(enum mbfl_no_encoding no_encoding)
+const mbfl_encoding *mbfl_no2encoding(enum mbfl_no_encoding no_encoding)
{
const mbfl_encoding *encoding;
int i;
@@ -219,8 +217,7 @@
return NULL;
}
-enum mbfl_no_encoding
-mbfl_name2no_encoding(const char *name)
+enum mbfl_no_encoding mbfl_name2no_encoding(const char *name)
{
const mbfl_encoding *encoding;
@@ -232,8 +229,7 @@
}
}
-const char *
-mbfl_no_encoding2name(enum mbfl_no_encoding no_encoding)
+const char *mbfl_no_encoding2name(enum mbfl_no_encoding no_encoding)
{
const mbfl_encoding *encoding;
@@ -245,8 +241,7 @@
}
}
-const char *
-mbfl_no2preferred_mime_name(enum mbfl_no_encoding no_encoding)
+const char * mbfl_no2preferred_mime_name(enum mbfl_no_encoding no_encoding)
{
const mbfl_encoding *encoding;
@@ -258,8 +253,7 @@
}
}
-int
-mbfl_is_support_encoding(const char *name)
+int mbfl_is_support_encoding(const char *name)
{
const mbfl_encoding *encoding;
1.2 +4 -8 libmbfl/mbfl/mbfl_language.c
Index: mbfl_language.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_language.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mbfl_language.c 20 Dec 2002 19:36:28 -0000 1.1
+++ mbfl_language.c 20 Dec 2002 20:11:48 -0000 1.2
@@ -56,8 +56,7 @@
};
/* language resolver */
-const mbfl_language *
-mbfl_name2language(const char *name)
+const mbfl_language * mbfl_name2language(const char *name)
{
const mbfl_language *language;
int i, j;
@@ -97,8 +96,7 @@
return NULL;
}
-const mbfl_language *
-mbfl_no2language(enum mbfl_no_language no_language)
+const mbfl_language * mbfl_no2language(enum mbfl_no_language no_language)
{
const mbfl_language *language;
int i;
@@ -113,8 +111,7 @@
return NULL;
}
-enum mbfl_no_language
-mbfl_name2no_language(const char *name)
+enum mbfl_no_language mbfl_name2no_language(const char *name)
{
const mbfl_language *language;
@@ -126,8 +123,7 @@
}
}
-const char *
-mbfl_no_language2name(enum mbfl_no_language no_language)
+const char * mbfl_no_language2name(enum mbfl_no_language no_language)
{
const mbfl_language *language;
1.2 +13 -26 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mbfl_memory_device.c 20 Dec 2002 19:36:28 -0000 1.1
+++ mbfl_memory_device.c 20 Dec 2002 20:11:48 -0000 1.2
@@ -41,8 +41,7 @@
/*
* memory device output functions
*/
-void
-mbfl_memory_device_init(mbfl_memory_device *device, int initsz, int allocsz)
+void mbfl_memory_device_init(mbfl_memory_device *device, int initsz, int allocsz)
{
if (device) {
device->length = 0;
@@ -62,8 +61,7 @@
}
}
-void
-mbfl_memory_device_realloc(mbfl_memory_device *device, int initsz, int allocsz)
+void mbfl_memory_device_realloc(mbfl_memory_device *device, int initsz, int allocsz)
{
unsigned char *tmp;
@@ -83,8 +81,7 @@
}
}
-void
-mbfl_memory_device_clear(mbfl_memory_device *device)
+void mbfl_memory_device_clear(mbfl_memory_device *device)
{
if (device) {
if (device->buffer) {
@@ -104,16 +101,14 @@
}
}
-void
-mbfl_memory_device_unput(mbfl_memory_device *device)
+void mbfl_memory_device_unput(mbfl_memory_device *device)
{
if (device->pos > 0) {
device->pos--;
}
}
-mbfl_string *
-mbfl_memory_device_result(mbfl_memory_device *device, mbfl_string *result)
+mbfl_string *mbfl_memory_device_result(mbfl_memory_device *device, mbfl_string *result)
{
if (device && result) {
result->len = device->pos;
@@ -133,8 +128,7 @@
return result;
}
-int
-mbfl_memory_device_output(int c, void *data)
+int mbfl_memory_device_output(int c, void *data)
{
mbfl_memory_device *device = (mbfl_memory_device *)data;
@@ -156,8 +150,7 @@
return c;
}
-int
-mbfl_memory_device_output2(int c, void *data)
+int mbfl_memory_device_output2(int c, void *data)
{
mbfl_memory_device *device = (mbfl_memory_device *)data;
@@ -181,8 +174,7 @@
return c;
}
-int
-mbfl_memory_device_output4(int c, void* data)
+int mbfl_memory_device_output4(int c, void* data)
{
mbfl_memory_device *device = (mbfl_memory_device *)data;
@@ -208,8 +200,7 @@
return c;
}
-int
-mbfl_memory_device_strcat(mbfl_memory_device *device, const char *psrc)
+int mbfl_memory_device_strcat(mbfl_memory_device *device, const char *psrc)
{
int len;
unsigned char *w;
@@ -244,8 +235,7 @@
return len;
}
-int
-mbfl_memory_device_strncat(mbfl_memory_device *device, const char *psrc, int len)
+int mbfl_memory_device_strncat(mbfl_memory_device *device, const char *psrc, int len)
{
unsigned char *w;
@@ -270,8 +260,7 @@
return len;
}
-int
-mbfl_memory_device_devcat(mbfl_memory_device *dest, mbfl_memory_device *src)
+int mbfl_memory_device_devcat(mbfl_memory_device *dest, mbfl_memory_device *src)
{
int n;
unsigned char *p, *w;
@@ -299,8 +288,7 @@
return n;
}
-void
-mbfl_wchar_device_init(mbfl_wchar_device *device)
+void mbfl_wchar_device_init(mbfl_wchar_device *device)
{
if (device) {
device->buffer = (unsigned int *)0;
@@ -323,8 +311,7 @@
}
}
-int
-mbfl_wchar_device_output(int c, void *data)
+int mbfl_wchar_device_output(int c, void *data)
{
mbfl_wchar_device *device = (mbfl_wchar_device *)data;