- added svn props

- fixed mixed line endings on flash.c, log.c, gdb_server.c

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

2 files changed, 20 insertions, 20 deletions

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 35695d69..91fe01b6 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -1,8 +1,8 @@
-INCLUDES = $(all_includes)

-METASOURCES = AUTO

-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@

-noinst_LIBRARIES = libhelper.a

-libhelper_a_SOURCES = binarybuffer.c configuration.c options.c log.c interpreter.c command.c time_support.c \

-	replacements.c fileio.c

-noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \

-	interpreter.h time_support.h replacements.h fileio.h

+INCLUDES = $(all_includes)
+METASOURCES = AUTO
+AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
+noinst_LIBRARIES = libhelper.a
+libhelper_a_SOURCES = binarybuffer.c configuration.c options.c log.c interpreter.c command.c time_support.c \
+	replacements.c fileio.c
+noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
+	interpreter.h time_support.h replacements.h fileio.h
diff --git a/src/helper/log.c b/src/helper/log.c
index c55fd572..769816a6 100644
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -70,8 +70,8 @@ static void log_printfv(enum log_levels level, const char *file, int line, const
 	if (debug_level >= LOG_DEBUG)
 	{
 		/* print with count and time information */
-		int t=(int)(time(NULL)-start);

-		fprintf(log_output, "%s %d %d %s:%d %s(): %s\n", log_strings[level+1], count, t, file, line, function, buffer);

+		int t=(int)(time(NULL)-start);
+		fprintf(log_output, "%s %d %d %s:%d %s(): %s\n", log_strings[level+1], count, t, file, line, function, buffer);
 	}
 	else
 	{
@@ -80,7 +80,7 @@ static void log_printfv(enum log_levels level, const char *file, int line, const
 	}
 
 	fflush(log_output);
-	
+
 	/* Never forward LOG_DEBUG, too verbose and they can be found in the log if need be */
 	if (level <= LOG_INFO)
 	{
@@ -101,7 +101,7 @@ void log_printf(enum log_levels level, const char *file, int line, const char *f
 	va_start(args, format);
 	log_printfv(level, file, line, function, format, args);
 	va_end(args);
-	
+
 }
 
 void log_printfnl(enum log_levels level, const char *file, int line, const char *function, const char *format, ...)
@@ -109,11 +109,11 @@ void log_printfnl(enum log_levels level, const char *file, int line, const char
 	count++;
 	if (level > debug_level)
 		return;
-	
+
 	char *t=malloc(strlen(format)+2);
 	strcpy(t, format);
 	strcat(t, "\n");
-	
+
 	va_list args;
 	va_start(args, format);
 	log_printfv(level, file, line, function, t, args);
@@ -148,7 +148,7 @@ int handle_log_output_command(struct command_context_s *cmd_ctx, char *cmd, char
 	if (argc == 1)
 	{
 		FILE* file = fopen(args[0], "w");
-		
+
 		if (file)
 		{
 			log_output = file;
@@ -174,15 +174,15 @@ int log_init(struct command_context_s *cmd_ctx)
 	/* set defaults for daemon configuration, if not set by cmdline or cfgfile */
 	if (debug_level == -1)
 		debug_level = LOG_INFO;
-	
+
 	if (log_output == NULL)
 	{
 		log_output = stderr;
 	}
-	
+
 	return ERROR_OK;
 }
-	
+
 int set_log_output(struct command_context_s *cmd_ctx, FILE *output)
 {
 	log_output = output;
@@ -236,7 +236,7 @@ int log_remove_callback(log_callback_fn fn, void *priv)
 char *alloc_printf(const char *fmt, va_list ap)
 {
 	char *string = NULL;
-	
+
 	/* start by 0 to exercise all the code paths. Need minimum 2 bytes to
 	 * fit 1 char and 0 terminator. */
 	int size = 0;
@@ -255,7 +255,7 @@ char *alloc_printf(const char *fmt, va_list ap)
 				return NULL;
 			}
 		}
-	
+
 	    int ret;
 	    ret = vsnprintf(string, size, fmt, ap);
 	    /* NB! The result of the vsnprintf() might be an *EMPTY* string! */