David Brownell <david-b@pacbell.net>:

Clean up the PLD files:

 - Get rid of some extraneous whitespace
 - Make various functions static
 - Wrap overlong lines


git-svn-id: svn://svn.berlios.de/openocd/trunk@2272 b42882b7-edfa-0310-969c-e2dbd0fdcd60

1 files changed, 20 insertions, 19 deletions

diff --git a/src/pld/xilinx_bit.c b/src/pld/xilinx_bit.c
index ef3c1e65..e647a9c5 100644
--- a/src/pld/xilinx_bit.c
+++ b/src/pld/xilinx_bit.c
@@ -28,13 +28,14 @@
 #include <sys/stat.h>
 
 
-int read_section(FILE *input_file, int length_size, char section, u32 *buffer_length, u8 **buffer) 
+static int read_section(FILE *input_file, int length_size, char section,
+		u32 *buffer_length, u8 **buffer)
 {
 	u8 length_buffer[4];
 	int length;
 	char section_char;
 	int read_count;
-	
+
 	if ((length_size != 2) && (length_size != 4))
 	{
 		LOG_ERROR("BUG: length_size neither 2 nor 4");
@@ -45,7 +46,7 @@ int read_section(FILE *input_file, int length_size, char section, u32 *buffer_le
 	{
 		return ERROR_PLD_FILE_LOAD_FAILED;
 	}
-	
+
 	if (section_char != section)
 	{
 		return ERROR_PLD_FILE_LOAD_FAILED;
@@ -55,22 +56,22 @@ int read_section(FILE *input_file, int length_size, char section, u32 *buffer_le
 	{
 		return ERROR_PLD_FILE_LOAD_FAILED;
 	}
-	
+
 	if (length_size == 4)
 		length = be_to_h_u32(length_buffer);
 	else /* (length_size == 2) */
 		length = be_to_h_u16(length_buffer);
-		
+
 	if (buffer_length)
 		*buffer_length = length;
-	
+
 	*buffer = malloc(length);
-	
+
 	if ((read_count = fread(*buffer, 1, length, input_file)) != length)
 	{
 		return ERROR_PLD_FILE_LOAD_FAILED;
 	}
-	
+
 	return ERROR_OK;
 }
 
@@ -79,10 +80,10 @@ int xilinx_read_bit_file(xilinx_bit_file_t *bit_file, char *filename)
 	FILE *input_file;
 	struct stat input_stat;
 	int read_count;
-	
+
 	if (!filename || !bit_file)
 		return ERROR_INVALID_ARGUMENTS;
-	
+
 	if (stat(filename, &input_stat) == -1)
 	{
 		LOG_ERROR("couldn't stat() %s: %s", filename, strerror(errno));
@@ -94,30 +95,30 @@ int xilinx_read_bit_file(xilinx_bit_file_t *bit_file, char *filename)
 		LOG_ERROR("%s is a directory", filename);
 		return ERROR_PLD_FILE_LOAD_FAILED;
 	}
-		
+
 	if (input_stat.st_size == 0){
 		LOG_ERROR("Empty file %s", filename);
 		return ERROR_PLD_FILE_LOAD_FAILED;
 	}
-		
+
 	if (!(input_file = fopen(filename, "rb")))
 	{
 		LOG_ERROR("couldn't open %s: %s", filename, strerror(errno));
 		return ERROR_PLD_FILE_LOAD_FAILED;
 	}
-	
+
 	if ((read_count = fread(bit_file->unknown_header, 1, 13, input_file)) != 13)
 	{
 		LOG_ERROR("couldn't read unknown_header from file '%s'", filename);
 		return ERROR_PLD_FILE_LOAD_FAILED;
 	}
-	
+
 	if (read_section(input_file, 2, 'a', NULL, &bit_file->source_file) != ERROR_OK)
 		return ERROR_PLD_FILE_LOAD_FAILED;
-	
+
 	if (read_section(input_file, 2, 'b', NULL, &bit_file->part_name) != ERROR_OK)
 		return ERROR_PLD_FILE_LOAD_FAILED;
-	
+
 	if (read_section(input_file, 2, 'c', NULL, &bit_file->date) != ERROR_OK)
 		return ERROR_PLD_FILE_LOAD_FAILED;
 
@@ -126,11 +127,11 @@ int xilinx_read_bit_file(xilinx_bit_file_t *bit_file, char *filename)
 
 	if (read_section(input_file, 4, 'e', &bit_file->length, &bit_file->data) != ERROR_OK)
 		return ERROR_PLD_FILE_LOAD_FAILED;
-	
+
 	LOG_DEBUG("bit_file: %s %s %s,%s %i", bit_file->source_file, bit_file->part_name,
 		bit_file->date, bit_file->time, bit_file->length);
-	
+
 	fclose(input_file);
-	
+
 	return ERROR_OK;
 }