Piotr Esden-Tempski <piotr@esden.net> Mac OS X compile fixes

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

diff --git a/src/flash/avrf.c b/src/flash/avrf.c
index 09bc3093cdbc17c198e40f5f9cb2d6e7615d99d3..9d32e6d19a26fc42e6141794e0ed7ac65a4dcbf8 100644 (file)
--- a/src/flash/avrf.c
+++ b/src/flash/avrf.c
@@ -247,13 +247,13 @@ static int avrf_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd,
 
 static int avrf_erase(struct flash_bank_s *bank, int first, int last)
 {
-       LOG_INFO(__FUNCTION__);
+       LOG_INFO("%s", __FUNCTION__);
        return ERROR_OK;
 }
 
 static int avrf_protect(struct flash_bank_s *bank, int set, int first, int last)
 {
-       LOG_INFO(__FUNCTION__);
+       LOG_INFO("%s", __FUNCTION__);
        return ERROR_OK;
 }
 
@@ -386,7 +386,7 @@ static int avrf_auto_probe(struct flash_bank_s *bank)
 
 static int avrf_protect_check(struct flash_bank_s *bank)
 {
-       LOG_INFO(__FUNCTION__);
+       LOG_INFO("%s", __FUNCTION__);
        return ERROR_OK;
 }
 
@@ -495,6 +495,6 @@ static int avrf_handle_mass_erase_command(struct command_context_s *cmd_ctx, cha
                command_print(cmd_ctx, "avr mass erase failed");
        }
        
-       LOG_DEBUG(__FUNCTION__);
+       LOG_DEBUG("%s", __FUNCTION__);
        return ERROR_OK;
 }

diff --git a/src/target/avrt.c b/src/target/avrt.c
index 95f818eb784a824339a909b9ca17875303c04baf..2697f5113ffbb4283d97de1b5afa7423476b9644 100644 (file)
--- a/src/target/avrt.c
+++ b/src/target/avrt.c
@@ -119,7 +119,7 @@ target_type_t avr_target =
 
 int avr_register_commands(struct command_context_s *cmd_ctx)
 {
-       LOG_DEBUG(__FUNCTION__);
+       LOG_DEBUG("%s", __FUNCTION__);
        return ERROR_OK;
 }
 
@@ -135,19 +135,19 @@ int avr_target_create(struct target_s *target, Jim_Interp *interp)
 
 int avr_init_target(struct command_context_s *cmd_ctx, struct target_s *target)
 {
-       LOG_DEBUG(__FUNCTION__);
+       LOG_DEBUG("%s", __FUNCTION__);
        return ERROR_OK;
 }
 
 int avr_quit(void)
 {
-       LOG_DEBUG(__FUNCTION__);
+       LOG_DEBUG("%s", __FUNCTION__);
        return ERROR_OK;
 }
 
 int avr_arch_state(struct target_s *target)
 {
-       LOG_DEBUG(__FUNCTION__);
+       LOG_DEBUG("%s", __FUNCTION__);
        return ERROR_OK;
 }
 
@@ -158,25 +158,25 @@ int avr_poll(target_t *target)
                target->state = TARGET_HALTED;
        }
        
-       LOG_DEBUG(__FUNCTION__);
+       LOG_DEBUG("%s", __FUNCTION__);
        return ERROR_OK;
 }
 
 int avr_halt(target_t *target)
 {
-       LOG_DEBUG(__FUNCTION__);
+       LOG_DEBUG("%s", __FUNCTION__);
        return ERROR_OK;
 }
 
 int avr_resume(struct target_s *target, int current, u32 address, int handle_breakpoints, int debug_execution)
 {
-       LOG_DEBUG(__FUNCTION__);
+       LOG_DEBUG("%s", __FUNCTION__);
        return ERROR_OK;
 }
 
 int avr_step(struct target_s *target, int current, u32 address, int handle_breakpoints)
 {
-       LOG_DEBUG(__FUNCTION__);
+       LOG_DEBUG("%s", __FUNCTION__);
        return ERROR_OK;
 }
 
@@ -184,7 +184,7 @@ int avr_assert_reset(target_t *target)
 {
        target->state = TARGET_RESET;
        
-       LOG_DEBUG(__FUNCTION__);
+       LOG_DEBUG("%s", __FUNCTION__);
        return ERROR_OK;
 }
 
@@ -192,13 +192,13 @@ int avr_deassert_reset(target_t *target)
 {
        target->state = TARGET_RUNNING;
        
-       LOG_DEBUG(__FUNCTION__);
+       LOG_DEBUG("%s", __FUNCTION__);
        return ERROR_OK;
 }
 
 int avr_soft_reset_halt(struct target_s *target)
 {
-       LOG_DEBUG(__FUNCTION__);
+       LOG_DEBUG("%s", __FUNCTION__);
        return ERROR_OK;
 }