C99 printf() -Werror fixes

[openocd.git] / src / pld / xilinx_bit.c

diff --git a/src/pld/xilinx_bit.c b/src/pld/xilinx_bit.c
index 3c99db0d21350b0eb2c07f74196df8d8fd91a0cf..73d6123762644802bf5e9bc8c75a5c143d5ca2c8 100644 (file)
--- a/src/pld/xilinx_bit.c
+++ b/src/pld/xilinx_bit.c
@@ -22,31 +22,23 @@
 #endif
 
 #include "xilinx_bit.h"
-
 #include "pld.h"
 #include "log.h"
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
 
-#include <sys/time.h>
-#include <time.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,
+               uint32_t *buffer_length, uint8_t **buffer)
 {
-       u8 length_buffer[4];
-       u32 length;
+       uint8_t length_buffer[4];
+       int length;
        char section_char;
        int read_count;
-       
+
        if ((length_size != 2) && (length_size != 4))
        {
-               ERROR("BUG: length_size neither 2 nor 4");
+               LOG_ERROR("BUG: length_size neither 2 nor 4");
                return ERROR_PLD_FILE_LOAD_FAILED;
        }
 
@@ -54,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;
@@ -64,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;
 }
 
@@ -88,45 +80,45 @@ 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)
        {
-               ERROR("couldn't stat() %s: %s", filename, strerror(errno));
+               LOG_ERROR("couldn't stat() %s: %s", filename, strerror(errno));
                return ERROR_PLD_FILE_LOAD_FAILED;
        }
 
        if (S_ISDIR(input_stat.st_mode))
        {
-               ERROR("%s is a directory", filename);
+               LOG_ERROR("%s is a directory", filename);
                return ERROR_PLD_FILE_LOAD_FAILED;
        }
-               
+
        if (input_stat.st_size == 0){
-               ERROR("Empty file %s", filename);
+               LOG_ERROR("Empty file %s", filename);
                return ERROR_PLD_FILE_LOAD_FAILED;
        }
-               
+
        if (!(input_file = fopen(filename, "rb")))
        {
-               ERROR("couldn't open %s: %s", filename, strerror(errno));
+               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)
        {
-               ERROR("couldn't read unknown_header from file '%s'", filename);
+               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;
 
@@ -135,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;
-       
-       DEBUG("bit_file: %s %s %s,%s %i", bit_file->source_file, bit_file->part_name,
+
+       LOG_DEBUG("bit_file: %s %s %s,%s %" PRIi32 "", bit_file->source_file, bit_file->part_name,
                bit_file->date, bit_file->time, bit_file->length);
-       
+
        fclose(input_file);
-       
+
        return ERROR_OK;
 }