gdb-server: fix -Wshadow warning

[fw/openocd] / src / jtag / commands.c

diff --git a/src/jtag/commands.c b/src/jtag/commands.c
index ccd6d0f13fedb4b680789406a6bb742b27194441..d236fe997a2f24a55c6e5e9323ba7a9cf7e5841f 100644 (file)
--- a/src/jtag/commands.c
+++ b/src/jtag/commands.c
@@ -31,6 +31,7 @@
 #include "config.h"
 #endif
 
+#include <jtag/jtag.h>
 #include "commands.h"
 
 struct cmd_queue_page {
@@ -120,7 +121,7 @@ void* cmd_queue_alloc(size_t size)
        return t + offset;
 }
 
-void cmd_queue_free(void)
+static void cmd_queue_free(void)
 {
        struct cmd_queue_page *page = cmd_queue_pages;
 
@@ -179,7 +180,7 @@ int jtag_build_buffer(const struct scan_command *cmd, uint8_t **buffer)
        int i;
 
        bit_count = jtag_scan_size(cmd);
-       *buffer = calloc(1,CEIL(bit_count, 8));
+       *buffer = calloc(1,DIV_ROUND_UP(bit_count, 8));
 
        bit_count = 0;
 
@@ -235,7 +236,7 @@ int jtag_read_buffer(uint8_t *buffer, const struct scan_command *cmd)
                if (cmd->fields[i].in_value)
                {
                        int num_bits = cmd->fields[i].num_bits;
-                       uint8_t *captured = buf_set_buf(buffer, bit_count, malloc(CEIL(num_bits, 8)), 0, num_bits);
+                       uint8_t *captured = buf_set_buf(buffer, bit_count, malloc(DIV_ROUND_UP(num_bits, 8)), 0, num_bits);
 
 #ifdef _DEBUG_JTAG_IO_
                        char *char_buf = buf_to_str(captured,