svnno****@sourc*****
svnno****@sourc*****
2011年 3月 10日 (木) 23:23:31 JST
ForkRevision: 413
http://sourceforge.jp/projects/swfed/svn/view?view=rev&revision=413
Author: yoya
Date: 2011-03-10 23:23:31 +0900 (Thu, 10 Mar 2011)
Log Message:
-----------
コードの整形
- 関数間の改行は1つずつ
- 余分な空行を削除
- 関数の戻り値のインデントを合わせる
Modified Paths:
--------------
trunk/src/bitmap_util.c
trunk/src/bitstream.c
trunk/src/jpeg_segment.c
trunk/src/swf_action.c
trunk/src/swf_debug.c
trunk/src/swf_gif.c
trunk/src/swf_header.c
trunk/src/swf_object.c
trunk/src/swf_png.c
trunk/src/swf_tag.c
trunk/src/swf_tag_edit.c
trunk/src/swf_tag_jpeg.c
trunk/src/y_keyvalue.c
-------------- next part --------------
Modified: trunk/src/bitmap_util.c
===================================================================
--- trunk/src/bitmap_util.c 2011-03-10 14:10:35 UTC (rev 412)
+++ trunk/src/bitmap_util.c 2011-03-10 14:23:31 UTC (rev 413)
@@ -57,7 +57,6 @@
return 1; // ng
}
-
int
png_size(unsigned char *data, unsigned long data_len,
int *width, int *height) {
@@ -71,7 +70,6 @@
}
int
-
gif_size(unsigned char *data, unsigned long data_len,
int *width, int *height) {
if (data_len < 10) {
@@ -83,7 +81,6 @@
return 0;
}
-
#ifdef __BITMAP_UTIL_DEBUG__ /* for component debug */
#include <sys/stat.h>
Modified: trunk/src/bitstream.c
===================================================================
--- trunk/src/bitstream.c 2011-03-10 14:10:35 UTC (rev 412)
+++ trunk/src/bitstream.c 2011-03-10 14:23:31 UTC (rev 413)
@@ -383,12 +383,11 @@
bitstream_length(bitstream_t *bs) {
return bs->data_len;
}
+
/*
* utility
*/
-
-
signed long
bitstream_unsigned2signed(unsigned long num, int size) {
unsigned long sig_bit = 1 << (size - 1);
@@ -439,7 +438,6 @@
return ret;
}
-
/*
* error handling
*/
@@ -454,6 +452,7 @@
bitstream_printerror(bitstream_t *bs) {
(void) bs;
}
+
/*
* for debug
*/
Modified: trunk/src/jpeg_segment.c
===================================================================
--- trunk/src/jpeg_segment.c 2011-03-10 14:10:35 UTC (rev 412)
+++ trunk/src/jpeg_segment.c 2011-03-10 14:23:31 UTC (rev 413)
@@ -202,6 +202,7 @@
}
return count;
}
+
int
jpeg_segment_peek_marker(jpeg_segment_t *jpeg_seg) {
jpeg_segment_node_t *node;
@@ -213,7 +214,8 @@
return -1;
}
-void jpeg_segment_print(jpeg_segment_t *jpeg_seg) {
+void
+jpeg_segment_print(jpeg_segment_t *jpeg_seg) {
int i;
jpeg_segment_node_t *node;
if (jpeg_seg == NULL) {
@@ -267,6 +269,7 @@
bitstream_close(bs);
return data;
}
+
void jpeg_segment_destroy(jpeg_segment_t *jpeg_seg) {
jpeg_segment_node_t *node, *next_node;
if (jpeg_seg == NULL) {
Modified: trunk/src/swf_action.c
===================================================================
--- trunk/src/swf_action.c 2011-03-10 14:10:35 UTC (rev 412)
+++ trunk/src/swf_action.c 2011-03-10 14:23:31 UTC (rev 413)
@@ -213,7 +213,6 @@
return 0;
}
-
swf_action_list_t *
swf_action_list_create(bitstream_t *bs) {
swf_action_list_t *action_list;
@@ -285,7 +284,8 @@
}
}
-int swf_action_data_print(unsigned char *action_data, unsigned short action_data_len) {
+int
+swf_action_data_print(unsigned char *action_data, unsigned short action_data_len) {
unsigned char type = action_data[0] & 0xff;
unsigned char *data = action_data+1;
unsigned short data_len = action_data_len - 1;
Modified: trunk/src/swf_debug.c
===================================================================
--- trunk/src/swf_debug.c 2011-03-10 14:10:35 UTC (rev 412)
+++ trunk/src/swf_debug.c 2011-03-10 14:23:31 UTC (rev 413)
@@ -15,10 +15,10 @@
int linenum;
} malloc_debug_table[MALLOC_DEBUG_TABLE_NUM];
-
static int malloc_debug_stack = 0;
-void malloc_debug_start(void) {
+void
+malloc_debug_start(void) {
int i;
malloc_debug_stack ++;
if (malloc_debug_stack > 1) {
@@ -31,7 +31,8 @@
fprintf(stderr, "malloc_debug_start: 0/n=0/%d\n", MALLOC_DEBUG_TABLE_NUM);
}
-void malloc_debug_end(void) {
+void
+malloc_debug_end(void) {
int i, j = 0;
malloc_debug_stack --;
if (malloc_debug_stack > 0) {
Modified: trunk/src/swf_gif.c
===================================================================
--- trunk/src/swf_gif.c 2011-03-10 14:10:35 UTC (rev 412)
+++ trunk/src/swf_gif.c 2011-03-10 14:23:31 UTC (rev 413)
@@ -39,7 +39,8 @@
* gif read
*/
-int gif_data_read_func(GifFileType* GifFile, GifByteType* buf, int count) {
+int
+gif_data_read_func(GifFileType* GifFile, GifByteType* buf, int count) {
my_gif_buffer *gif_buff = (my_gif_buffer *) GifFile->UserData;
if (gif_buff->data_offset + count <= gif_buff->data_len) {
memcpy(buf, gif_buff->data + gif_buff->data_offset, count);
@@ -56,7 +57,8 @@
* gif write
*/
-int gif_data_write_func(GifFileType* GifFile, const GifByteType* buf, int count)
+int
+gif_data_write_func(GifFileType* GifFile, const GifByteType* buf, int count)
{
my_gif_buffer *gif_buff = (my_gif_buffer *) GifFile->UserData;
unsigned long new_data_len;
@@ -81,7 +83,8 @@
/*
* getTransparentIndex
*/
-int getTransparentIndex(SavedImage Image) {
+int
+getTransparentIndex(SavedImage Image) {
int i;
int transparent_index = -1;
if ((Image.ExtensionBlockCount == 0) || (Image.ExtensionBlocks == NULL)) {
Modified: trunk/src/swf_header.c
===================================================================
--- trunk/src/swf_header.c 2011-03-10 14:10:35 UTC (rev 412)
+++ trunk/src/swf_header.c 2011-03-10 14:23:31 UTC (rev 413)
@@ -15,6 +15,7 @@
header->file_length = bitstream_getbytesLE(bs, 4);
return 0;
}
+
int
swf_header_build(bitstream_t *bs, swf_header_t *header) {
if (bitstream_putstring(bs, header->magic, 3)) {
@@ -63,4 +64,3 @@
header_movie->frame_count);
return 0;
}
-
Modified: trunk/src/swf_object.c
===================================================================
--- trunk/src/swf_object.c 2011-03-10 14:10:35 UTC (rev 412)
+++ trunk/src/swf_object.c 2011-03-10 14:23:31 UTC (rev 413)
@@ -45,6 +45,7 @@
malloc_debug_end(); /* DEBUG XXX */
return ;
}
+
int
swf_object_input(swf_object_t *swf, unsigned char *data,
unsigned long data_len) {
@@ -319,7 +320,6 @@
return 1; // failure
}
-
unsigned char *
swf_object_get_shapedata(swf_object_t *swf, int cid, unsigned long *length) {
swf_tag_t *tag;
@@ -527,7 +527,6 @@
return data;
}
-
int
swf_object_replace_jpegdata(swf_object_t *swf, int image_id,
unsigned char *jpeg_data,
@@ -623,7 +622,6 @@
return result;
}
-
#endif /* HAVE_PNG */
#ifdef HAVE_GIF
Modified: trunk/src/swf_png.c
===================================================================
--- trunk/src/swf_png.c 2011-03-10 14:10:35 UTC (rev 412)
+++ trunk/src/swf_png.c 2011-03-10 14:23:31 UTC (rev 413)
@@ -28,7 +28,8 @@
* png read
*/
-static void png_data_read_func(png_structp png_ptr, png_bytep buf, png_size_t size) {
+static void
+png_data_read_func(png_structp png_ptr, png_bytep buf, png_size_t size) {
my_png_buffer *png_buff = (my_png_buffer *)png_get_io_ptr(png_ptr);
if (png_buff->data_offset + size <= png_buff->data_len) {
memcpy(buf, png_buff->data + png_buff->data_offset, size);
@@ -49,7 +50,8 @@
* png write
*/
-void png_data_write_func(png_structp png_ptr, png_bytep buf, png_size_t size) {
+void
+png_data_write_func(png_structp png_ptr, png_bytep buf, png_size_t size) {
my_png_buffer *png_buff = (my_png_buffer *)png_get_io_ptr(png_ptr);
unsigned long new_data_len;
if (png_buff->data_offset + size > png_buff->data_len) {
@@ -70,7 +72,8 @@
png_buff->data_offset += size;
}
-void png_data_write(png_structp png_ptr, my_png_buffer *png_buff) {
+void
+png_data_write(png_structp png_ptr, my_png_buffer *png_buff) {
png_set_write_fn(png_ptr, (png_voidp) png_buff,
(png_rw_ptr)png_data_write_func, NULL);
}
Modified: trunk/src/swf_tag.c
===================================================================
--- trunk/src/swf_tag.c 2011-03-10 14:10:35 UTC (rev 412)
+++ trunk/src/swf_tag.c 2011-03-10 14:23:31 UTC (rev 413)
@@ -135,7 +135,6 @@
free(tag);
}
-
static int swf_tag_and_length_build(bitstream_t *bs, swf_tag_t *tag) {
signed short tag_and_length;
if (bs == NULL) {
@@ -430,10 +429,8 @@
return 1;
}
return ret;
-
}
-
unsigned char *
swf_tag_get_jpeg_data(swf_tag_t *tag, unsigned long *length, int image_id, swf_tag_t *tag_jpegtables) {
swf_tag_info_t *tag_info = NULL;
@@ -745,7 +742,6 @@
return result;
}
-
char *
swf_tag_get_edit_string(swf_tag_t *tag,
char *variable_name, int variable_name_len,
@@ -769,7 +765,6 @@
variable_name, variable_name_len);
}
-
int
swf_tag_replace_edit_string(swf_tag_t *tag,
char *variable_name, int variable_name_len,
Modified: trunk/src/swf_tag_edit.c
===================================================================
--- trunk/src/swf_tag_edit.c 2011-03-10 14:10:35 UTC (rev 412)
+++ trunk/src/swf_tag_edit.c 2011-03-10 14:23:31 UTC (rev 413)
@@ -25,7 +25,6 @@
return &edit_detail_handler;
}
-
void *
swf_tag_edit_create_detail(void) {
swf_tag_edit_detail_t *swf_tag_edit;
Modified: trunk/src/swf_tag_jpeg.c
===================================================================
--- trunk/src/swf_tag_jpeg.c 2011-03-10 14:10:35 UTC (rev 412)
+++ trunk/src/swf_tag_jpeg.c 2011-03-10 14:23:31 UTC (rev 413)
@@ -216,6 +216,7 @@
}
return GetUShortLE(data); // image_id;
}
+
int
swf_tag_jpeg_replace_cid_detail(swf_tag_t *tag, int image_id) {
unsigned char *data = NULL;
@@ -233,6 +234,7 @@
}
return 0;
}
+
unsigned char *
swf_tag_jpeg_output_detail(swf_tag_t *tag, unsigned long *length,
struct swf_object_ *swf) {
@@ -398,11 +400,12 @@
return ;
}
-unsigned char *swf_tag_jpeg_get_jpeg_data(void *detail,
- unsigned long *length,
- int image_id,
- unsigned char *jpeg_table_data,
- unsigned long jpeg_table_data_len) {
+unsigned char *
+swf_tag_jpeg_get_jpeg_data(void *detail,
+ unsigned long *length,
+ int image_id,
+ unsigned char *jpeg_table_data,
+ unsigned long jpeg_table_data_len) {
swf_tag_jpeg_detail_t *swf_tag_jpeg = (swf_tag_jpeg_detail_t *) detail;
unsigned char *data;
if (detail == NULL) {
Modified: trunk/src/y_keyvalue.c
===================================================================
--- trunk/src/y_keyvalue.c 2011-03-10 14:10:35 UTC (rev 412)
+++ trunk/src/y_keyvalue.c 2011-03-10 14:23:31 UTC (rev 413)
@@ -39,7 +39,6 @@
free(st);
}
-
/*
* set/get/delete
*/
@@ -138,6 +137,7 @@
return 0;// false
}
+
char *
y_keyvalue_get_currentkey(y_keyvalue_t *st, int *key_len) {
if (st->get_offset >= st->use_len) {
@@ -146,6 +146,7 @@
*key_len = st->table[st->get_offset].key_len;
return st->table[st->get_offset].key;
}
+
char *
y_keyvalue_get_currentvalue(y_keyvalue_t *st, int *value_len) {
if (st->get_offset >= st->use_len) {