From 2585fc34200938fb3fa55a450ea37f68012aafa7 Mon Sep 17 00:00:00 2001 From: oharboe Date: Wed, 9 Apr 2008 05:55:23 +0000 Subject: Don Porges fixed c99 issues. git-svn-id: svn://svn.berlios.de/openocd/trunk@553 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/helper/command.c | 17 +++++++++++------ src/helper/log.c | 12 ++++++------ src/helper/replacements.c | 2 ++ src/helper/replacements.h | 2 +- src/helper/time_support.c | 2 -- src/helper/time_support.h | 12 ++++++++++-- 6 files changed, 30 insertions(+), 17 deletions(-) (limited to 'src/helper') diff --git a/src/helper/command.c b/src/helper/command.c index ef567333..ec7cc6bb 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -142,10 +142,10 @@ command_t* register_command(command_context_t *context, command_t *parent, char int unregister_command(command_context_t *context, char *name) { - unique_length_dirty = 1; - command_t *c, *p = NULL, *c2; + unique_length_dirty = 1; + if ((!context) || (!name)) return ERROR_INVALID_ARGUMENTS; @@ -452,7 +452,11 @@ int command_run_file(command_context_t *context, FILE *file, enum command_mode m void command_print_help_line(command_context_t* context, struct command_s *command, int indent) { command_t *c; + #ifdef HAVE_C_VARRAYS char indent_text[indent + 2]; + #else + char indent_text[68]; + #endif char *help = "no help available"; char name_buf[64]; @@ -578,12 +582,13 @@ int handle_sleep_command(struct command_context_s *cmd_ctx, char *cmd, char **ar int handle_time_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - if (argc<1) - return ERROR_COMMAND_SYNTAX_ERROR; - duration_t duration; char *duration_text; int retval; + float t; + + if (argc<1) + return ERROR_COMMAND_SYNTAX_ERROR; duration_start_measure(&duration); @@ -591,7 +596,7 @@ int handle_time_command(struct command_context_s *cmd_ctx, char *cmd, char **arg duration_stop_measure(&duration, &duration_text); - float t=duration.duration.tv_sec; + t=duration.duration.tv_sec; t+=((float)duration.duration.tv_usec / 1000000.0); command_print(cmd_ctx, "%s took %fs", args[0], t); diff --git a/src/helper/log.c b/src/helper/log.c index d0f0e3dd..34e73b6a 100644 --- a/src/helper/log.c +++ b/src/helper/log.c @@ -29,7 +29,6 @@ #include #include #include -#include int debug_level = -1; @@ -61,6 +60,7 @@ static int count = 0; */ static void log_puts(enum log_levels level, const char *file, int line, const char *function, const char *string) { + char *f; if (level == LOG_LVL_OUTPUT) { /* do not prepend any headers, just print out what we were given and return */ @@ -69,7 +69,7 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch return; } - char *f = strrchr(file, '/'); + f = strrchr(file, '/'); if (f != NULL) file = f + 1; @@ -112,12 +112,12 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch void log_printf(enum log_levels level, const char *file, int line, const char *function, const char *format, ...) { char *string; + va_list ap; count++; if (level > debug_level) return; - va_list ap; va_start(ap, format); string = alloc_vprintf(format, ap); @@ -133,12 +133,12 @@ void log_printf(enum log_levels level, const char *file, int line, const char *f void log_printf_lf(enum log_levels level, const char *file, int line, const char *function, const char *format, ...) { char *string; + va_list ap; count++; if (level > debug_level) return; - va_list ap; va_start(ap, format); string = alloc_vprintf(format, ap); @@ -276,6 +276,8 @@ char *alloc_vprintf(const char *fmt, va_list ap) for (;;) { char *t = string; + va_list ap_copy; + int ret; string = realloc(string, size); if (string == NULL) { @@ -284,10 +286,8 @@ char *alloc_vprintf(const char *fmt, va_list ap) return NULL; } - va_list ap_copy; va_copy(ap_copy, ap); - int ret; ret = vsnprintf(string, size, fmt, ap_copy); /* NB! The result of the vsnprintf() might be an *EMPTY* string! */ if ((ret >= 0) && ((ret + 1) < size)) diff --git a/src/helper/replacements.c b/src/helper/replacements.c index 7a6729b8..bebca28e 100644 --- a/src/helper/replacements.c +++ b/src/helper/replacements.c @@ -25,7 +25,9 @@ #include #include +#ifdef HAVE_STRINGS_H #include +#endif /* * clear_malloc * diff --git a/src/helper/replacements.h b/src/helper/replacements.h index 4df76012..71e4c66c 100644 --- a/src/helper/replacements.h +++ b/src/helper/replacements.h @@ -187,7 +187,7 @@ static __inline int close_socket(int sock) static __inline void socket_nonblock(int fd) { #ifdef _WIN32 - long nonblock = 1; + unsigned long nonblock = 1; ioctlsocket(fd, FIONBIO, &nonblock ); #else int oldopts = fcntl(fd, F_GETFL, 0); diff --git a/src/helper/time_support.c b/src/helper/time_support.c index 26774614..e97993be 100644 --- a/src/helper/time_support.c +++ b/src/helper/time_support.c @@ -26,8 +26,6 @@ #include "log.h" #include -#include -#include int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y); int timeval_add(struct timeval *result, struct timeval *x, struct timeval *y); diff --git a/src/helper/time_support.h b/src/helper/time_support.h index 05dc9119..311c88d3 100644 --- a/src/helper/time_support.h +++ b/src/helper/time_support.h @@ -20,8 +20,16 @@ #ifndef TIME_SUPPORT_H #define TIME_SUPPORT_H -#include -#include +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif extern int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y); extern int timeval_add(struct timeval *result, struct timeval *x, struct timeval *y); -- cgit v1.2.3