X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fpld%2Fxilinx_bit.c;h=25deb80822cd57a3e26bae87ab3aa5a2c521d2f0;hb=382148e4dd437978997d668f6ec715ddcec1c46e;hp=ea4f0ec8897676f406b5177fbb70112ede47d5d4;hpb=4668bd264cfe64c3e3ddd0f75cb5bf2e5e85f717;p=openocd.git

diff --git a/src/pld/xilinx_bit.c b/src/pld/xilinx_bit.c
index ea4f0ec889..25deb80822 100644
--- a/src/pld/xilinx_bit.c
+++ b/src/pld/xilinx_bit.c
@@ -1,22 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2006 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -26,40 +14,35 @@
 #include <helper/log.h>
 
 #include <sys/stat.h>
-
+#include <helper/system.h>
 
 static int read_section(FILE *input_file, int length_size, char section,
-		uint32_t *buffer_length, uint8_t **buffer)
+	uint32_t *buffer_length, uint8_t **buffer)
 {
 	uint8_t length_buffer[4];
 	int length;
 	char section_char;
 	int read_count;
 
-	if ((length_size != 2) && (length_size != 4))
-	{
+	if ((length_size != 2) && (length_size != 4)) {
 		LOG_ERROR("BUG: length_size neither 2 nor 4");
 		return ERROR_PLD_FILE_LOAD_FAILED;
 	}
 
-	if ((read_count = fread(&section_char, 1, 1, input_file)) != 1)
-	{
+	read_count = fread(&section_char, 1, 1, input_file);
+	if (read_count != 1)
 		return ERROR_PLD_FILE_LOAD_FAILED;
-	}
 
 	if (section_char != section)
-	{
 		return ERROR_PLD_FILE_LOAD_FAILED;
-	}
 
-	if ((read_count = fread(length_buffer, 1, length_size, input_file)) != length_size)
-	{
+	read_count = fread(length_buffer, 1, length_size, input_file);
+	if (read_count != length_size)
 		return ERROR_PLD_FILE_LOAD_FAILED;
-	}
 
 	if (length_size == 4)
 		length = be_to_h_u32(length_buffer);
-	else /* (length_size == 2) */
+	else	/* (length_size == 2) */
 		length = be_to_h_u16(length_buffer);
 
 	if (buffer_length)
@@ -67,10 +50,9 @@ static int read_section(FILE *input_file, int length_size, char section,
 
 	*buffer = malloc(length);
 
-	if ((read_count = fread(*buffer, 1, length, input_file)) != length)
-	{
+	read_count = fread(*buffer, 1, length, input_file);
+	if (read_count != length)
 		return ERROR_PLD_FILE_LOAD_FAILED;
-	}
 
 	return ERROR_OK;
 }
@@ -84,14 +66,12 @@ int xilinx_read_bit_file(struct xilinx_bit_file *bit_file, const char *filename)
 	if (!filename || !bit_file)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	if (stat(filename, &input_stat) == -1)
-	{
+	if (stat(filename, &input_stat) == -1) {
 		LOG_ERROR("couldn't stat() %s: %s", filename, strerror(errno));
 		return ERROR_PLD_FILE_LOAD_FAILED;
 	}
 
-	if (S_ISDIR(input_stat.st_mode))
-	{
+	if (S_ISDIR(input_stat.st_mode)) {
 		LOG_ERROR("%s is a directory", filename);
 		return ERROR_PLD_FILE_LOAD_FAILED;
 	}
@@ -101,14 +81,14 @@ int xilinx_read_bit_file(struct xilinx_bit_file *bit_file, const char *filename)
 		return ERROR_PLD_FILE_LOAD_FAILED;
 	}
 
-	if (!(input_file = fopen(filename, "rb")))
-	{
+	input_file = fopen(filename, "rb");
+	if (!input_file) {
 		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)
-	{
+	read_count = fread(bit_file->unknown_header, 1, 13, input_file);
+	if (read_count != 13) {
 		LOG_ERROR("couldn't read unknown_header from file '%s'", filename);
 		return ERROR_PLD_FILE_LOAD_FAILED;
 	}
@@ -128,7 +108,7 @@ int xilinx_read_bit_file(struct xilinx_bit_file *bit_file, const 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 %" PRIi32 "", bit_file->source_file, bit_file->part_name,
+	LOG_DEBUG("bit_file: %s %s %s,%s %" PRIu32 "", bit_file->source_file, bit_file->part_name,
 		bit_file->date, bit_file->time, bit_file->length);
 
 	fclose(input_file);