Restore trainling whitespace in .patch and .diff files wehre required

31 files changed, 158 insertions, 158 deletions

diff --git a/misc/tools/README.txt b/misc/tools/README.txt
index 64ca0b3bd..7eaa77fff 100644
--- a/misc/tools/README.txt
+++ b/misc/tools/README.txt
@@ -128,7 +128,7 @@ kconfig-frontends-3.3.0-1-libintl.patch
 
   See: http://ymorin.is-a-geek.org/hg/kconfig-frontends/file/tip/docs/known-issues.txt
 
-  Update: Version 3.6.0 (and above) will build on Cygwin with no patches: 
+  Update: Version 3.6.0 (and above) will build on Cygwin with no patches:
 
     http://ymorin.is-a-geek.org/download/kconfig-frontends/
 
diff --git a/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch b/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch
index 3fe3f8163..4774194d0 100644
--- a/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch
+++ b/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch
@@ -3,11 +3,11 @@ diff -ru kconfig-frontends-3.3.0-1.orig//frontends/nconf/nconf.c kconfig-fronten
 +++ kconfig-frontends-3.3.0-1/frontends/nconf/nconf.c	2012-04-05 15:16:06.590563200 -0600
 @@ -1503,7 +1503,7 @@
  	}
- 
+
  	notimeout(stdscr, FALSE);
 -	ESCDELAY = 1;
 +	//ESCDELAY = 1;
- 
+
  	/* set btns menu */
  	curses_menu = new_menu(curses_menu_items);
 diff -ru kconfig-frontends-3.3.0-1.orig//frontends/nconf/nconf.h kconfig-frontends-3.3.0-1/frontends/nconf/nconf.h
@@ -27,22 +27,22 @@ diff -ru kconfig-frontends-3.3.0-1.orig//libs/lxdialog/dialog.h kconfig-frontend
 @@ -26,11 +26,7 @@
  #include <string.h>
  #include <stdbool.h>
- 
+
 -#ifndef KBUILD_NO_NLS
 -# include <libintl.h>
 -#else
  # define gettext(Msgid) ((const char *) (Msgid))
 -#endif
- 
+
  #ifdef __sun__
  #define CURS_MACROS
 diff -ru kconfig-frontends-3.3.0-1.orig//libs/parser/lkc.h kconfig-frontends-3.3.0-1/libs/parser/lkc.h
 --- kconfig-frontends-3.3.0-1.orig//libs/parser/lkc.h	2012-03-20 16:07:45.000000000 -0600
 +++ kconfig-frontends-3.3.0-1/libs/parser/lkc.h	2012-04-05 14:59:02.969015400 -0600
 @@ -8,14 +8,10 @@
- 
+
  #include "expr.h"
- 
+
 -#ifndef KBUILD_NO_NLS
 -# include <libintl.h>
 -#else
@@ -51,7 +51,7 @@ diff -ru kconfig-frontends-3.3.0-1.orig//libs/parser/lkc.h kconfig-frontends-3.3
  static inline void bindtextdomain(const char *name, const char *dir) {}
  static inline char *bind_textdomain_codeset(const char *dn, char *c) { return c; }
 -#endif
- 
+
  #ifdef __cplusplus
  extern "C" {
 diff -ru kconfig-frontends-3.3.0-1.orig//libs/parser/yconf.c kconfig-frontends-3.3.0-1/libs/parser/yconf.c
@@ -59,7 +59,7 @@ diff -ru kconfig-frontends-3.3.0-1.orig//libs/parser/yconf.c kconfig-frontends-3
 +++ kconfig-frontends-3.3.0-1/libs/parser/yconf.c	2012-04-05 14:59:40.732175300 -0600
 @@ -285,12 +285,6 @@
  #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
- 
+
  #ifndef YY_
 -# if YYENABLE_NLS
 -#  if ENABLE_NLS
diff --git a/misc/tools/kconfig-frontends/Makefile.in b/misc/tools/kconfig-frontends/Makefile.in
index 0d1e6f93d..d1ac32ce7 100644
--- a/misc/tools/kconfig-frontends/Makefile.in
+++ b/misc/tools/kconfig-frontends/Makefile.in
@@ -358,7 +358,7 @@ scripts/.autostuff/config.h: scripts/.autostuff/stamp-h1
 scripts/.autostuff/stamp-h1: $(top_srcdir)/scripts/.autostuff/config.h.in $(top_builddir)/config.status
 	@rm -f scripts/.autostuff/stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status scripts/.autostuff/config.h
-$(top_srcdir)/scripts/.autostuff/config.h.in:  $(am__configure_deps) 
+$(top_srcdir)/scripts/.autostuff/config.h.in:  $(am__configure_deps)
 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f scripts/.autostuff/stamp-h1
 	touch $@
diff --git a/misc/tools/kconfig-frontends/aclocal.m4 b/misc/tools/kconfig-frontends/aclocal.m4
index 94136cef4..815633438 100644
--- a/misc/tools/kconfig-frontends/aclocal.m4
+++ b/misc/tools/kconfig-frontends/aclocal.m4
@@ -22,7 +22,7 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
 
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # serial 1 (pkg-config-0.24)
-# 
+#
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -145,7 +145,7 @@ if test $pkg_failed = yes; then
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
+        else
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
diff --git a/misc/tools/kconfig-frontends/docs/kconfig-language.txt b/misc/tools/kconfig-frontends/docs/kconfig-language.txt
index c420676c6..8174b4ed2 100644
--- a/misc/tools/kconfig-frontends/docs/kconfig-language.txt
+++ b/misc/tools/kconfig-frontends/docs/kconfig-language.txt
@@ -173,7 +173,7 @@ module state. Dependency expressions have the following syntax:
            <expr> '&&' <expr>                   (6)
            <expr> '||' <expr>                   (7)
 
-Expressions are listed in decreasing order of precedence. 
+Expressions are listed in decreasing order of precedence.
 
 (1) Convert the symbol into an expression. Boolean and tristate symbols
     are simply converted into the respective expression values. All
diff --git a/misc/tools/kconfig-frontends/frontends/conf/Makefile.in b/misc/tools/kconfig-frontends/frontends/conf/Makefile.in
index 9e8ee4c66..caaa7b329 100644
--- a/misc/tools/kconfig-frontends/frontends/conf/Makefile.in
+++ b/misc/tools/kconfig-frontends/frontends/conf/Makefile.in
@@ -368,7 +368,7 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-conf$(EXEEXT): $(conf_OBJECTS) $(conf_DEPENDENCIES) $(EXTRA_conf_DEPENDENCIES) 
+conf$(EXEEXT): $(conf_OBJECTS) $(conf_DEPENDENCIES) $(EXTRA_conf_DEPENDENCIES)
 	@rm -f conf$(EXEEXT)
 	$(AM_V_CCLD)$(conf_LINK) $(conf_OBJECTS) $(conf_LDADD) $(LIBS)
 
diff --git a/misc/tools/kconfig-frontends/frontends/gconf/Makefile.in b/misc/tools/kconfig-frontends/frontends/gconf/Makefile.in
index b491ef5d4..1e7362b06 100644
--- a/misc/tools/kconfig-frontends/frontends/gconf/Makefile.in
+++ b/misc/tools/kconfig-frontends/frontends/gconf/Makefile.in
@@ -407,7 +407,7 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-gconf$(EXEEXT): $(gconf_OBJECTS) $(gconf_DEPENDENCIES) $(EXTRA_gconf_DEPENDENCIES) 
+gconf$(EXEEXT): $(gconf_OBJECTS) $(gconf_DEPENDENCIES) $(EXTRA_gconf_DEPENDENCIES)
 	@rm -f gconf$(EXEEXT)
 	$(AM_V_CCLD)$(gconf_LINK) $(gconf_OBJECTS) $(gconf_LDADD) $(LIBS)
 
diff --git a/misc/tools/kconfig-frontends/frontends/gconf/gconf.c.patch b/misc/tools/kconfig-frontends/frontends/gconf/gconf.c.patch
index 4b55ff7b8..d43076161 100644
--- a/misc/tools/kconfig-frontends/frontends/gconf/gconf.c.patch
+++ b/misc/tools/kconfig-frontends/frontends/gconf/gconf.c.patch
@@ -2,12 +2,12 @@ diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c
 --- a/frontends/gconf/gconf.c
 +++ b/frontends/gconf/gconf.c
 @@ -12,7 +12,7 @@
- 
+
  #include <stdlib.h>
  #include "lkc.h"
 -#include "images.c"
 +#include "images.h"
- 
+
  #include <glade/glade.h>
  #include <gtk/gtk.h>
 @@ -1468,8 +1468,10 @@
@@ -19,13 +19,13 @@ diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c
 +#endif
 -	gchar *glade_file;
 +	gchar *glade_file = GUI_PATH;
- 
+
  	bindtextdomain(PACKAGE, LOCALEDIR);
  	bind_textdomain_codeset(PACKAGE, "UTF-8");
 @@ -1483,6 +1485,7 @@
  	//add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
  	//add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps");
- 
+
 +#if 0
  	/* Determine GUI path */
  	env = getenv(SRCTREE);
@@ -35,6 +35,6 @@ diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c
  	else
  		glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL);
 +#endif
- 
+
  	/* Conf stuffs */
  	if (ac > 1 && av[1][0] == '-') {
diff --git a/misc/tools/kconfig-frontends/frontends/mconf/Makefile.in b/misc/tools/kconfig-frontends/frontends/mconf/Makefile.in
index 0b684e88e..ba59b7df9 100644
--- a/misc/tools/kconfig-frontends/frontends/mconf/Makefile.in
+++ b/misc/tools/kconfig-frontends/frontends/mconf/Makefile.in
@@ -374,7 +374,7 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-mconf$(EXEEXT): $(mconf_OBJECTS) $(mconf_DEPENDENCIES) $(EXTRA_mconf_DEPENDENCIES) 
+mconf$(EXEEXT): $(mconf_OBJECTS) $(mconf_DEPENDENCIES) $(EXTRA_mconf_DEPENDENCIES)
 	@rm -f mconf$(EXEEXT)
 	$(AM_V_CCLD)$(mconf_LINK) $(mconf_OBJECTS) $(mconf_LDADD) $(LIBS)
 
diff --git a/misc/tools/kconfig-frontends/frontends/nconf/Makefile.in b/misc/tools/kconfig-frontends/frontends/nconf/Makefile.in
index 82540d27b..b9f9d682f 100644
--- a/misc/tools/kconfig-frontends/frontends/nconf/Makefile.in
+++ b/misc/tools/kconfig-frontends/frontends/nconf/Makefile.in
@@ -372,7 +372,7 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-nconf$(EXEEXT): $(nconf_OBJECTS) $(nconf_DEPENDENCIES) $(EXTRA_nconf_DEPENDENCIES) 
+nconf$(EXEEXT): $(nconf_OBJECTS) $(nconf_DEPENDENCIES) $(EXTRA_nconf_DEPENDENCIES)
 	@rm -f nconf$(EXEEXT)
 	$(AM_V_CCLD)$(nconf_LINK) $(nconf_OBJECTS) $(nconf_LDADD) $(LIBS)
 
diff --git a/misc/tools/kconfig-frontends/frontends/qconf/Makefile.in b/misc/tools/kconfig-frontends/frontends/qconf/Makefile.in
index a999f51a2..bb95195e3 100644
--- a/misc/tools/kconfig-frontends/frontends/qconf/Makefile.in
+++ b/misc/tools/kconfig-frontends/frontends/qconf/Makefile.in
@@ -397,7 +397,7 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-qconf$(EXEEXT): $(qconf_OBJECTS) $(qconf_DEPENDENCIES) $(EXTRA_qconf_DEPENDENCIES) 
+qconf$(EXEEXT): $(qconf_OBJECTS) $(qconf_DEPENDENCIES) $(EXTRA_qconf_DEPENDENCIES)
 	@rm -f qconf$(EXEEXT)
 	$(AM_V_CXXLD)$(qconf_LINK) $(qconf_OBJECTS) $(qconf_LDADD) $(LIBS)
 
diff --git a/misc/tools/kconfig-frontends/frontends/qconf/qconf.cc.patch b/misc/tools/kconfig-frontends/frontends/qconf/qconf.cc.patch
index 6769d750c..a8a78bb55 100644
--- a/misc/tools/kconfig-frontends/frontends/qconf/qconf.cc.patch
+++ b/misc/tools/kconfig-frontends/frontends/qconf/qconf.cc.patch
@@ -3,10 +3,10 @@ diff --git a/frontends/qconf/qconf.cc b/frontends/qconf/qconf.cc
 +++ b/frontends/qconf/qconf.cc
 @@ -47,7 +47,7 @@
  #include "qconf.h"
- 
+
  #include "qconf.moc"
 -#include "images.c"
 +#include "images.h"
- 
+
  #ifdef _
  # undef _
diff --git a/misc/tools/kconfig-frontends/libs/images/Makefile.in b/misc/tools/kconfig-frontends/libs/images/Makefile.in
index 6535424b2..2a748cda3 100644
--- a/misc/tools/kconfig-frontends/libs/images/Makefile.in
+++ b/misc/tools/kconfig-frontends/libs/images/Makefile.in
@@ -322,7 +322,7 @@ $(am__aclocal_m4_deps):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libkconfig-images.a: $(libkconfig_images_a_OBJECTS) $(libkconfig_images_a_DEPENDENCIES) $(EXTRA_libkconfig_images_a_DEPENDENCIES) 
+libkconfig-images.a: $(libkconfig_images_a_OBJECTS) $(libkconfig_images_a_DEPENDENCIES) $(EXTRA_libkconfig_images_a_DEPENDENCIES)
 	$(AM_V_at)-rm -f libkconfig-images.a
 	$(AM_V_AR)$(libkconfig_images_a_AR) libkconfig-images.a $(libkconfig_images_a_OBJECTS) $(libkconfig_images_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libkconfig-images.a
diff --git a/misc/tools/kconfig-frontends/libs/lxdialog/Makefile.in b/misc/tools/kconfig-frontends/libs/lxdialog/Makefile.in
index 0a07c7c90..86630bab3 100644
--- a/misc/tools/kconfig-frontends/libs/lxdialog/Makefile.in
+++ b/misc/tools/kconfig-frontends/libs/lxdialog/Makefile.in
@@ -334,7 +334,7 @@ $(am__aclocal_m4_deps):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libkconfig-lxdialog.a: $(libkconfig_lxdialog_a_OBJECTS) $(libkconfig_lxdialog_a_DEPENDENCIES) $(EXTRA_libkconfig_lxdialog_a_DEPENDENCIES) 
+libkconfig-lxdialog.a: $(libkconfig_lxdialog_a_OBJECTS) $(libkconfig_lxdialog_a_DEPENDENCIES) $(EXTRA_libkconfig_lxdialog_a_DEPENDENCIES)
 	$(AM_V_at)-rm -f libkconfig-lxdialog.a
 	$(AM_V_AR)$(libkconfig_lxdialog_a_AR) libkconfig-lxdialog.a $(libkconfig_lxdialog_a_OBJECTS) $(libkconfig_lxdialog_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libkconfig-lxdialog.a
diff --git a/misc/tools/kconfig-frontends/libs/parser/Makefile.in b/misc/tools/kconfig-frontends/libs/parser/Makefile.in
index d575f4e55..831feb460 100644
--- a/misc/tools/kconfig-frontends/libs/parser/Makefile.in
+++ b/misc/tools/kconfig-frontends/libs/parser/Makefile.in
@@ -413,7 +413,7 @@ clean-libLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libkconfig-parser.la: $(libkconfig_parser_la_OBJECTS) $(libkconfig_parser_la_DEPENDENCIES) $(EXTRA_libkconfig_parser_la_DEPENDENCIES) 
+libkconfig-parser.la: $(libkconfig_parser_la_OBJECTS) $(libkconfig_parser_la_DEPENDENCIES) $(EXTRA_libkconfig_parser_la_DEPENDENCIES)
 	$(AM_V_CCLD)$(libkconfig_parser_la_LINK) -rpath $(libdir) $(libkconfig_parser_la_OBJECTS) $(libkconfig_parser_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
diff --git a/misc/tools/kconfig-frontends/libs/parser/lconf.c b/misc/tools/kconfig-frontends/libs/parser/lconf.c
index 24aa3491c..aef090fb1 100644
--- a/misc/tools/kconfig-frontends/libs/parser/lconf.c
+++ b/misc/tools/kconfig-frontends/libs/parser/lconf.c
@@ -52,7 +52,7 @@
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
+ * if you want the limit (max/min) macros for int types.
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
@@ -69,7 +69,7 @@ typedef uint32_t flex_uint32_t;
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
 typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
+typedef unsigned char flex_uint8_t;
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
 
@@ -189,7 +189,7 @@ extern FILE *zconfin, *zconfout;
 #define EOB_ACT_LAST_MATCH 2
 
     #define YY_LESS_LINENO(n)
-    
+
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
@@ -251,7 +251,7 @@ struct yy_buffer_state
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-    
+
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -900,7 +900,7 @@ extern int zconfwrap (void );
 #endif
 
     static void yyunput (int c,char *buf_ptr  );
-    
+
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
@@ -1010,7 +1010,7 @@ YY_DECL
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-    
+
 	int str = 0;
 	int ts, i;
 
@@ -1621,7 +1621,7 @@ static int yy_get_next_buffer (void)
 {
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
-    
+
 	yy_current_state = (yy_start);
 
 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
@@ -1640,7 +1640,7 @@ static int yy_get_next_buffer (void)
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 {
 	register int yy_is_jam;
-    
+
 	yy_current_state = yy_nxt[yy_current_state][1];
 	yy_is_jam = (yy_current_state <= 0);
 
@@ -1650,7 +1650,7 @@ static int yy_get_next_buffer (void)
     static void yyunput (int c, register char * yy_bp )
 {
 	register char *yy_cp;
-    
+
     yy_cp = (yy_c_buf_p);
 
 	/* undo effects of setting up zconftext */
@@ -1693,7 +1693,7 @@ static int yy_get_next_buffer (void)
 
 {
 	int c;
-    
+
 	*(yy_c_buf_p) = (yy_hold_char);
 
 	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
@@ -1760,12 +1760,12 @@ static int yy_get_next_buffer (void)
 
 /** Immediately switch to a different input stream.
  * @param input_file A readable stream.
- * 
+ *
  * @note This function does not reset the start condition to @c INITIAL .
  */
     void zconfrestart  (FILE * input_file )
 {
-    
+
 	if ( ! YY_CURRENT_BUFFER ){
         zconfensure_buffer_stack ();
 		YY_CURRENT_BUFFER_LVALUE =
@@ -1778,11 +1778,11 @@ static int yy_get_next_buffer (void)
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
- * 
+ *
  */
     void zconf_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
-    
+
 	/* TODO. We should be able to replace this entire function body
 	 * with
 	 *		zconfpop_buffer_state();
@@ -1822,13 +1822,13 @@ static void zconf_load_buffer_state  (void)
 /** Allocate and initialize an input buffer state.
  * @param file A readable stream.
  * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
+ *
  * @return the allocated buffer state.
  */
     YY_BUFFER_STATE zconf_create_buffer  (FILE * file, int  size )
 {
 	YY_BUFFER_STATE b;
-    
+
 	b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in zconf_create_buffer()" );
@@ -1851,11 +1851,11 @@ static void zconf_load_buffer_state  (void)
 
 /** Destroy the buffer.
  * @param b a buffer created with zconf_create_buffer()
- * 
+ *
  */
     void zconf_delete_buffer (YY_BUFFER_STATE  b )
 {
-    
+
 	if ( ! b )
 		return;
 
@@ -1876,7 +1876,7 @@ static void zconf_load_buffer_state  (void)
 
 {
 	int oerrno = errno;
-    
+
 	zconf_flush_buffer(b );
 
 	b->yy_input_file = file;
@@ -1892,13 +1892,13 @@ static void zconf_load_buffer_state  (void)
     }
 
         b->yy_is_interactive = 0;
-    
+
 	errno = oerrno;
 }
 
 /** Discard all buffered characters. On the next scan, YY_INPUT will be called.
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
+ *
  */
     void zconf_flush_buffer (YY_BUFFER_STATE  b )
 {
@@ -1927,7 +1927,7 @@ static void zconf_load_buffer_state  (void)
  *  the current state. This function will allocate the stack
  *  if necessary.
  *  @param new_buffer The new state.
- *  
+ *
  */
 void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer )
 {
@@ -1957,7 +1957,7 @@ void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer )
 
 /** Removes and deletes the top of the stack, if present.
  *  The next element becomes the new top.
- *  
+ *
  */
 void zconfpop_buffer_state (void)
 {
@@ -1981,7 +1981,7 @@ void zconfpop_buffer_state (void)
 static void zconfensure_buffer_stack (void)
 {
 	int num_to_alloc;
-    
+
 	if (!(yy_buffer_stack)) {
 
 		/* First allocation is just for 2 elements, since we don't know if this
@@ -1994,9 +1994,9 @@ static void zconfensure_buffer_stack (void)
 								);
 		if ( ! (yy_buffer_stack) )
 			YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" );
-								  
+
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
+
 		(yy_buffer_stack_max) = num_to_alloc;
 		(yy_buffer_stack_top) = 0;
 		return;
@@ -2024,13 +2024,13 @@ static void zconfensure_buffer_stack (void)
 /** Setup the input buffer state to scan directly from a user-specified character buffer.
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
- * 
- * @return the newly allocated buffer state object. 
+ *
+ * @return the newly allocated buffer state object.
  */
 YY_BUFFER_STATE zconf_scan_buffer  (char * base, yy_size_t  size )
 {
 	YY_BUFFER_STATE b;
-    
+
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
@@ -2059,14 +2059,14 @@ YY_BUFFER_STATE zconf_scan_buffer  (char * base, yy_size_t  size )
 /** Setup the input buffer state to scan a string. The next call to zconflex() will
  * scan from a @e copy of @a str.
  * @param yystr a NUL-terminated string to scan
- * 
+ *
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
  *       zconf_scan_bytes() instead.
  */
 YY_BUFFER_STATE zconf_scan_string (yyconst char * yystr )
 {
-    
+
 	return zconf_scan_bytes(yystr,strlen(yystr) );
 }
 
@@ -2074,7 +2074,7 @@ YY_BUFFER_STATE zconf_scan_string (yyconst char * yystr )
  * scan from a @e copy of @a bytes.
  * @param yybytes the byte buffer to scan
  * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
- * 
+ *
  * @return the newly allocated buffer state object.
  */
 YY_BUFFER_STATE zconf_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
@@ -2083,7 +2083,7 @@ YY_BUFFER_STATE zconf_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
 	char *buf;
 	yy_size_t n;
 	int i;
-    
+
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
 	buf = (char *) zconfalloc(n  );
@@ -2137,16 +2137,16 @@ static void yy_fatal_error (yyconst char* msg )
 /* Accessor  methods (get/set functions) to struct members. */
 
 /** Get the current line number.
- * 
+ *
  */
 int zconfget_lineno  (void)
 {
-        
+
     return zconflineno;
 }
 
 /** Get the input stream.
- * 
+ *
  */
 FILE *zconfget_in  (void)
 {
@@ -2154,7 +2154,7 @@ FILE *zconfget_in  (void)
 }
 
 /** Get the output stream.
- * 
+ *
  */
 FILE *zconfget_out  (void)
 {
@@ -2162,7 +2162,7 @@ FILE *zconfget_out  (void)
 }
 
 /** Get the length of the current token.
- * 
+ *
  */
 int zconfget_leng  (void)
 {
@@ -2170,7 +2170,7 @@ int zconfget_leng  (void)
 }
 
 /** Get the current token.
- * 
+ *
  */
 
 char *zconfget_text  (void)
@@ -2180,18 +2180,18 @@ char *zconfget_text  (void)
 
 /** Set the current line number.
  * @param line_number
- * 
+ *
  */
 void zconfset_lineno (int  line_number )
 {
-    
+
     zconflineno = line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
  * @param in_str A readable stream.
- * 
+ *
  * @see zconf_switch_to_buffer
  */
 void zconfset_in (FILE *  in_str )
@@ -2245,7 +2245,7 @@ static int yy_init_globals (void)
 /* zconflex_destroy is for both reentrant and non-reentrant scanners. */
 int zconflex_destroy  (void)
 {
-    
+
     /* Pop the buffer stack, destroying each element. */
 	while(YY_CURRENT_BUFFER){
 		zconf_delete_buffer(YY_CURRENT_BUFFER  );
diff --git a/misc/tools/kconfig-frontends/libs/parser/yconf.c b/misc/tools/kconfig-frontends/libs/parser/yconf.c
index 817829aef..6b6efcab2 100644
--- a/misc/tools/kconfig-frontends/libs/parser/yconf.c
+++ b/misc/tools/kconfig-frontends/libs/parser/yconf.c
@@ -1,19 +1,19 @@
 /* A Bison parser, made by GNU Bison 2.5.  */
 
 /* Bison implementation for Yacc-like parsers in C
-   
+
       Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
-   
+
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
diff --git a/misc/tools/kconfig-frontends/libs/parser/yconf.y.patch b/misc/tools/kconfig-frontends/libs/parser/yconf.y.patch
index 6856904ce..09b9bbf55 100644
--- a/misc/tools/kconfig-frontends/libs/parser/yconf.y.patch
+++ b/misc/tools/kconfig-frontends/libs/parser/yconf.y.patch
@@ -1,27 +1,27 @@
 --- a/libs/parser/yconf.y	2012-01-12 22:37:17.582339777 +0100
 +++ b/libs/parser/yconf.y	2012-03-03 23:55:29.889737630 +0100
 @@ -96,7 +96,7 @@
- 
+
  %{
  /* Include zconf.hash.c here so it can see the token constants. */
 -#include "zconf.hash.c"
 +#include "hconf.c"
  %}
- 
+
  %%
 @@ -493,7 +493,7 @@
- 
+
  	sym_init();
  	_menu_init();
 -	rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
 +	rootmenu.prompt = menu_add_prompt(P_MENU, ROOTMENU, NULL);
- 
+
  	if (getenv("ZCONF_DEBUG"))
  		zconfdebug = 1;
 @@ -725,7 +725,7 @@
  	}
  }
- 
+
 -#include "zconf.lex.c"
 +#include "lconf.c"
  #include "util.c"
diff --git a/misc/tools/kconfig-frontends/scripts/.autostuff/m4/libtool.m4 b/misc/tools/kconfig-frontends/scripts/.autostuff/m4/libtool.m4
index 02b4bbec5..2da2dc98d 100644
--- a/misc/tools/kconfig-frontends/scripts/.autostuff/m4/libtool.m4
+++ b/misc/tools/kconfig-frontends/scripts/.autostuff/m4/libtool.m4
@@ -1196,7 +1196,7 @@ fi
 # Invoke $ECHO with all args, space-separated.
 func_echo_all ()
 {
-    $ECHO "$*" 
+    $ECHO "$*"
 }
 
 case "$ECHO" in
diff --git a/misc/tools/kconfig-frontends/scripts/.autostuff/m4/lt~obsolete.m4 b/misc/tools/kconfig-frontends/scripts/.autostuff/m4/lt~obsolete.m4
index c573da90c..ffeab5680 100644
--- a/misc/tools/kconfig-frontends/scripts/.autostuff/m4/lt~obsolete.m4
+++ b/misc/tools/kconfig-frontends/scripts/.autostuff/m4/lt~obsolete.m4
@@ -25,7 +25,7 @@
 # included after everything else.  This provides aclocal with the
 # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
 # because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
 #
 # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
 # Yes, that means every name once taken will need to remain here until
diff --git a/misc/tools/kconfig-frontends/utils/Makefile.in b/misc/tools/kconfig-frontends/utils/Makefile.in
index 06e1026a1..fe3c93a72 100644
--- a/misc/tools/kconfig-frontends/utils/Makefile.in
+++ b/misc/tools/kconfig-frontends/utils/Makefile.in
@@ -404,7 +404,7 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-gettext$(EXEEXT): $(gettext_OBJECTS) $(gettext_DEPENDENCIES) $(EXTRA_gettext_DEPENDENCIES) 
+gettext$(EXEEXT): $(gettext_OBJECTS) $(gettext_DEPENDENCIES) $(EXTRA_gettext_DEPENDENCIES)
 	@rm -f gettext$(EXEEXT)
 	$(AM_V_CCLD)$(gettext_LINK) $(gettext_OBJECTS) $(gettext_LDADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
diff --git a/misc/tools/kconfig-frontends/utils/tweak.in.patch b/misc/tools/kconfig-frontends/utils/tweak.in.patch
index c4b855790..0fc79e1a9 100644
--- a/misc/tools/kconfig-frontends/utils/tweak.in.patch
+++ b/misc/tools/kconfig-frontends/utils/tweak.in.patch
@@ -2,20 +2,20 @@ diff --git a/utils/tweak.in b/utils/tweak.in
 --- a/utils/tweak.in
 +++ b/utils/tweak.in
 @@ -3,8 +3,8 @@
- 
+
  myname=${0##*/}
- 
+
 -# If no prefix forced, use the default CONFIG_
 -CONFIG_="${CONFIG_-CONFIG_}"
 +# If no prefix forced, use the default @CONFIG_@
 +CONFIG_="${CONFIG_-@CONFIG_@}"
- 
+
  usage() {
  	cat >&2 <<EOL
 @@ -41,7 +41,7 @@
  By default, $myname will upper-case the given symbol. Use --keep-case to keep
  the case of all following symbols unchanged.
- 
+
 -$myname uses 'CONFIG_' as the default symbol prefix. Set the environment
 +$myname uses '@CONFIG_@' as the default symbol prefix. Set the environment
  variable CONFIG_ to the prefix to use. Eg.: CONFIG_="FOO_" $myname ...
diff --git a/misc/tools/kconfig-language.txt b/misc/tools/kconfig-language.txt
index a686f9cd6..fbcc81fd9 100644
--- a/misc/tools/kconfig-language.txt
+++ b/misc/tools/kconfig-language.txt
@@ -172,7 +172,7 @@ module state. Dependency expressions have the following syntax:
            <expr> '&&' <expr>                   (6)
            <expr> '||' <expr>                   (7)
 
-Expressions are listed in decreasing order of precedence. 
+Expressions are listed in decreasing order of precedence.
 
 (1) Convert the symbol into an expression. Boolean and tristate symbols
     are simply converted into the respective expression values. All
diff --git a/misc/tools/kconfig-macos.diff b/misc/tools/kconfig-macos.diff
index 10e21bb85..e9ec90b68 100755
--- a/misc/tools/kconfig-macos.diff
+++ b/misc/tools/kconfig-macos.diff
@@ -6,9 +6,9 @@ diff -ru orig/kconfig-frontends-3.3.0-1/libs/parser/yconf.c kconfig-frontends-3.
  #include <string.h>
  #include <stdbool.h>
 +#include <stddef.h>
- 
+
  #include "lkc.h"
- 
+
 diff -ru orig/kconfig-frontends-3.3.0-1/libs/parser/yconf.y kconfig-frontends-3.3.0-1/libs/parser/yconf.y
 --- orig/kconfig-frontends-3.3.0-1/libs/parser/yconf.y	2012-03-20 15:07:45.000000000 -0700
 +++ kconfig-frontends-3.3.0-1/libs/parser/yconf.y	2012-04-13 23:38:22.000000000 -0700
@@ -17,6 +17,6 @@ diff -ru orig/kconfig-frontends-3.3.0-1/libs/parser/yconf.y kconfig-frontends-3.
  #include <string.h>
  #include <stdbool.h>
 +#include <stddef.h>
- 
+
  #include "lkc.h"
- 
+
diff --git a/misc/tools/osmocon/linuxlist.h b/misc/tools/osmocon/linuxlist.h
index ff2c49156..b7da3f5dc 100644
--- a/misc/tools/osmocon/linuxlist.h
+++ b/misc/tools/osmocon/linuxlist.h
@@ -54,14 +54,14 @@ struct llist_head {
 } while (0)
 
 /*
- * Insert a new entry between two known consecutive entries. 
+ * Insert a new entry between two known consecutive entries.
  *
  * This is only for internal llist manipulation where we know
  * the prev/next entries already!
  */
 static inline void __llist_add(struct llist_head *_new,
-			      struct llist_head *prev,
-			      struct llist_head *next)
+				 struct llist_head *prev,
+				 struct llist_head *next)
 {
 	next->prev = _new;
 	_new->next = next;
@@ -128,7 +128,7 @@ static inline void llist_del(struct llist_head *entry)
 static inline void llist_del_init(struct llist_head *entry)
 {
 	__llist_del(entry->prev, entry->next);
-	INIT_LLIST_HEAD(entry); 
+	INIT_LLIST_HEAD(entry);
 }
 
 /**
@@ -220,7 +220,7 @@ static inline void llist_splice_init(struct llist_head *llist,
  */
 #define llist_for_each(pos, head) \
 	for (pos = (head)->next, prefetch(pos->next); pos != (head); \
-        	pos = pos->next, prefetch(pos->next))
+		pos = pos->next, prefetch(pos->next))
 
 /**
  * __llist_for_each	-	iterate over a llist
@@ -242,8 +242,8 @@ static inline void llist_splice_init(struct llist_head *llist,
  */
 #define llist_for_each_prev(pos, head) \
 	for (pos = (head)->prev, prefetch(pos->prev); pos != (head); \
-        	pos = pos->prev, prefetch(pos->prev))
-        	
+		pos = pos->prev, prefetch(pos->prev))
+
 /**
  * llist_for_each_safe	-	iterate over a llist safe against removal of llist entry
  * @pos:	the &struct llist_head to use as a loop counter.
@@ -262,10 +262,10 @@ static inline void llist_splice_init(struct llist_head *llist,
  */
 #define llist_for_each_entry(pos, head, member)				\
 	for (pos = llist_entry((head)->next, typeof(*pos), member),	\
-		     prefetch(pos->member.next);			\
-	     &pos->member != (head); 					\
-	     pos = llist_entry(pos->member.next, typeof(*pos), member),	\
-		     prefetch(pos->member.next))
+			prefetch(pos->member.next);			\
+		&pos->member != (head); 					\
+		pos = llist_entry(pos->member.next, typeof(*pos), member),	\
+			prefetch(pos->member.next))
 
 /**
  * llist_for_each_entry_reverse - iterate backwards over llist of given type.
@@ -275,10 +275,10 @@ static inline void llist_splice_init(struct llist_head *llist,
  */
 #define llist_for_each_entry_reverse(pos, head, member)			\
 	for (pos = llist_entry((head)->prev, typeof(*pos), member),	\
-		     prefetch(pos->member.prev);			\
-	     &pos->member != (head); 					\
-	     pos = llist_entry(pos->member.prev, typeof(*pos), member),	\
-		     prefetch(pos->member.prev))
+			prefetch(pos->member.prev);			\
+		&pos->member != (head); 					\
+		pos = llist_entry(pos->member.prev, typeof(*pos), member),	\
+			prefetch(pos->member.prev))
 
 /**
  * llist_for_each_entry_continue -	iterate over llist of given type
@@ -289,10 +289,10 @@ static inline void llist_splice_init(struct llist_head *llist,
  */
 #define llist_for_each_entry_continue(pos, head, member) 		\
 	for (pos = llist_entry(pos->member.next, typeof(*pos), member),	\
-		     prefetch(pos->member.next);			\
-	     &pos->member != (head);					\
-	     pos = llist_entry(pos->member.next, typeof(*pos), member),	\
-		     prefetch(pos->member.next))
+			prefetch(pos->member.next);			\
+		&pos->member != (head);					\
+		pos = llist_entry(pos->member.next, typeof(*pos), member),	\
+			prefetch(pos->member.next))
 
 /**
  * llist_for_each_entry_safe - iterate over llist of given type safe against removal of llist entry
@@ -304,8 +304,8 @@ static inline void llist_splice_init(struct llist_head *llist,
 #define llist_for_each_entry_safe(pos, n, head, member)			\
 	for (pos = llist_entry((head)->next, typeof(*pos), member),	\
 		n = llist_entry(pos->member.next, typeof(*pos), member);	\
-	     &pos->member != (head); 					\
-	     pos = n, n = llist_entry(n->member.next, typeof(*n), member))
+		&pos->member != (head); 					\
+		pos = n, n = llist_entry(n->member.next, typeof(*n), member))
 
 /**
  * llist_for_each_rcu	-	iterate over an rcu-protected llist
@@ -315,11 +315,11 @@ static inline void llist_splice_init(struct llist_head *llist,
 #define llist_for_each_rcu(pos, head) \
 	for (pos = (head)->next, prefetch(pos->next); pos != (head); \
         	pos = pos->next, ({ smp_read_barrier_depends(); 0;}), prefetch(pos->next))
-        	
+
 #define __llist_for_each_rcu(pos, head) \
 	for (pos = (head)->next; pos != (head); \
         	pos = pos->next, ({ smp_read_barrier_depends(); 0;}))
-        	
+
 /**
  * llist_for_each_safe_rcu	-	iterate over an rcu-protected llist safe
  *					against removal of llist entry
@@ -339,15 +339,15 @@ static inline void llist_splice_init(struct llist_head *llist,
  */
 #define llist_for_each_entry_rcu(pos, head, member)			\
 	for (pos = llist_entry((head)->next, typeof(*pos), member),	\
-		     prefetch(pos->member.next);			\
-	     &pos->member != (head); 					\
-	     pos = llist_entry(pos->member.next, typeof(*pos), member),	\
-		     ({ smp_read_barrier_depends(); 0;}),		\
-		     prefetch(pos->member.next))
+			prefetch(pos->member.next);			\
+		&pos->member != (head); 					\
+		pos = llist_entry(pos->member.next, typeof(*pos), member),	\
+			({ smp_read_barrier_depends(); 0;}),		\
+			prefetch(pos->member.next))
 
 
 /**
- * llist_for_each_continue_rcu	-	iterate over an rcu-protected llist 
+ * llist_for_each_continue_rcu	-	iterate over an rcu-protected llist
  *			continuing after existing point.
  * @pos:	the &struct llist_head to use as a loop counter.
  * @head:	the head for your llist.
diff --git a/misc/tools/osmocon/linuxrbtree.h b/misc/tools/osmocon/linuxrbtree.h
index 079f440d0..57a58d502 100644
--- a/misc/tools/osmocon/linuxrbtree.h
+++ b/misc/tools/osmocon/linuxrbtree.h
@@ -1,7 +1,7 @@
 /*
   Red Black Trees
   (C) 1999  Andrea Arcangeli <andrea@suse.de>
-  
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
@@ -145,7 +145,7 @@ extern struct rb_node *rb_first(const struct rb_root *);
 extern struct rb_node *rb_last(const struct rb_root *);
 
 /* Fast replacement of a single node without remove/rebalance/add/rebalance */
-extern void rb_replace_node(struct rb_node *victim, struct rb_node *_new, 
+extern void rb_replace_node(struct rb_node *victim, struct rb_node *_new,
 			    struct rb_root *root);
 
 static inline void rb_link_node(struct rb_node * node, struct rb_node * parent,
diff --git a/misc/tools/osmocon/osmocon.c b/misc/tools/osmocon/osmocon.c
index 3dd738928..53f23667c 100644
--- a/misc/tools/osmocon/osmocon.c
+++ b/misc/tools/osmocon/osmocon.c
@@ -628,7 +628,7 @@ static int handle_write_dnload(void)
 		default:
 			break;
 		}
-	} else if (dnload.write_ptr >= dnload.data + dnload.data_len) { 
+	} else if (dnload.write_ptr >= dnload.data + dnload.data_len) {
 		printf("finished\n");
 		dnload.write_ptr = dnload.data;
 		dnload.serial_fd.when &= ~BSC_FD_WRITE;
diff --git a/misc/tools/osmocon/panic.c b/misc/tools/osmocon/panic.c
index 0dc7dcc6e..88a4bb6e5 100644
--- a/misc/tools/osmocon/panic.c
+++ b/misc/tools/osmocon/panic.c
@@ -17,7 +17,7 @@ void osmo_panic(const char *fmt, ...)
 	osmo_panic_default(fmt, args);
 	va_end(args);
 }
- 
+
 
 void osmo_set_panic_handler(osmo_panic_handler_t h)
 {
diff --git a/misc/tools/osmocon/rbtree.c b/misc/tools/osmocon/rbtree.c
index 9033a84ac..afdf60c0f 100644
--- a/misc/tools/osmocon/rbtree.c
+++ b/misc/tools/osmocon/rbtree.c
@@ -2,7 +2,7 @@
   Red Black Trees
   (C) 1999  Andrea Arcangeli <andrea@suse.de>
   (C) 2002  David Woodhouse <dwmw2@infradead.org>
-  
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
@@ -317,7 +317,7 @@ struct rb_node *rb_next(const struct rb_node *node)
 	/* If we have a right-hand child, go down and then left as far
 	   as we can. */
 	if (node->rb_right) {
-		node = node->rb_right; 
+		node = node->rb_right;
 		while (node->rb_left)
 			node=node->rb_left;
 		return (struct rb_node *)node;
@@ -345,7 +345,7 @@ struct rb_node *rb_prev(const struct rb_node *node)
 	/* If we have a left-hand child, go down and then right as far
 	   as we can. */
 	if (node->rb_left) {
-		node = node->rb_left; 
+		node = node->rb_left;
 		while (node->rb_right)
 			node=node->rb_right;
 		return (struct rb_node *)node;
diff --git a/misc/tools/osmocon/talloc.c b/misc/tools/osmocon/talloc.c
index c0072441d..6d99fe8a4 100644
--- a/misc/tools/osmocon/talloc.c
+++ b/misc/tools/osmocon/talloc.c
@@ -1,4 +1,4 @@
-/* 
+/*
    Samba Unix SMB/CIFS implementation.
 
    Samba trivial allocation library - new interface
@@ -7,11 +7,11 @@
 
    Copyright (C) Andrew Tridgell 2004
    Copyright (C) Stefan Metzmacher 2006
-   
+
      ** NOTE! The following LGPL license applies to the talloc
      ** library. This does NOT imply that all of Samba is released
      ** under the LGPL
-   
+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
@@ -71,7 +71,7 @@
 #define TALLOC_FLAG_POOLMEM 0x08	/* This is allocated in a pool */
 #define TALLOC_MAGIC_REFERENCE ((const char *)1)
 
-/* by default we abort when given a bad pointer (such as when talloc_free() is called 
+/* by default we abort when given a bad pointer (such as when talloc_free() is called
    on a pointer that came from malloc() */
 #ifndef TALLOC_ABORT
 #define TALLOC_ABORT(reason) abort()
@@ -185,7 +185,7 @@ static inline struct talloc_chunk *talloc_chunk_from_ptr(const void *ptr)
 {
 	const char *pp = (const char *)ptr;
 	struct talloc_chunk *tc = discard_const_p(struct talloc_chunk, pp - TC_HDR_SIZE);
-	if (unlikely((tc->flags & (TALLOC_FLAG_FREE | ~0xF)) != TALLOC_MAGIC)) { 
+	if (unlikely((tc->flags & (TALLOC_FLAG_FREE | ~0xF)) != TALLOC_MAGIC)) {
 		if (tc->flags & TALLOC_FLAG_FREE) {
 			talloc_abort_double_free();
 		} else {
@@ -330,7 +330,7 @@ static struct talloc_chunk *talloc_alloc_pool(struct talloc_chunk *parent,
 	return result;
 }
 
-/* 
+/*
    Allocate a bit of memory as a child of an existing pointer
 */
 static inline void *__talloc(const void *context, size_t size)
@@ -423,7 +423,7 @@ void _talloc_set_destructor(const void *ptr, int (*destructor)(void *))
 }
 
 /*
-  increase the reference count on a piece of memory. 
+  increase the reference count on a piece of memory.
 */
 int talloc_increase_ref_count(const void *ptr)
 {
@@ -446,7 +446,7 @@ static int talloc_reference_destructor(struct talloc_reference_handle *handle)
 }
 
 /*
-   more efficient way to add a name to a pointer - the name must point to a 
+   more efficient way to add a name to a pointer - the name must point to a
    true string constant
 */
 static inline void _talloc_set_name_const(const void *ptr, const char *name)
@@ -476,8 +476,8 @@ static inline void *_talloc_named_const(const void *context, size_t size, const
   make a secondary reference to a pointer, hanging off the given context.
   the pointer remains valid until both the original caller and this given
   context are freed.
-  
-  the major use for this is when two different structures need to reference the 
+
+  the major use for this is when two different structures need to reference the
   same underlying data, and you want to be able to free the two instances separately,
   and in either order
 */
@@ -503,7 +503,7 @@ void *_talloc_reference(const void *context, const void *ptr)
 }
 
 
-/* 
+/*
    internal talloc_free call
 */
 static inline int _talloc_free(void *ptr)
@@ -611,7 +611,7 @@ static inline int _talloc_free(void *ptr)
 	return 0;
 }
 
-/* 
+/*
    move a lump of memory from one talloc context to another return the
    ptr on success, or NULL if it could not be transferred.
    passing NULL as ptr will always return NULL with no side effects.
@@ -640,7 +640,7 @@ void *_talloc_steal(const void *new_ctx, const void *ptr)
 			if (tc->prev) tc->prev->next = tc->next;
 			if (tc->next) tc->next->prev = tc->prev;
 		}
-		
+
 		tc->parent = tc->next = tc->prev = NULL;
 		return discard_const_p(void, ptr);
 	}
@@ -729,7 +729,7 @@ int talloc_unlink(const void *context, void *ptr)
 			return -1;
 		}
 	}
-	
+
 	tc_p = talloc_chunk_from_ptr(ptr);
 
 	if (tc_p->refs == NULL) {
@@ -951,7 +951,7 @@ void talloc_free_children(void *ptr)
 	}
 }
 
-/* 
+/*
    Allocate a bit of memory as a child of an existing pointer
 */
 void *_talloc(const void *context, size_t size)
@@ -977,8 +977,8 @@ void *talloc_named_const(const void *context, size_t size, const char *name)
 	return _talloc_named_const(context, size, name);
 }
 
-/* 
-   free a talloc pointer. This also frees all child pointers of this 
+/*
+   free a talloc pointer. This also frees all child pointers of this
    pointer recursively
 
    return 0 if the memory is actually freed, otherwise -1. The memory
@@ -1064,9 +1064,9 @@ void *_talloc_realloc(const void *context, void *ptr, size_t size, const char *n
 		new_ptr = realloc(tc, size + TC_HDR_SIZE);
 	}
 #endif
-	if (unlikely(!new_ptr)) {	
-		tc->flags &= ~TALLOC_FLAG_FREE; 
-		return NULL; 
+	if (unlikely(!new_ptr)) {
+		tc->flags &= ~TALLOC_FLAG_FREE;
+		return NULL;
 	}
 
 	tc = (struct talloc_chunk *)new_ptr;
@@ -1230,14 +1230,14 @@ static void talloc_report_depth_FILE_helper(const void *ptr, int depth, int max_
 	}
 
 	if (depth == 0) {
-		fprintf(f,"%stalloc report on '%s' (total %6lu bytes in %3lu blocks)\n", 
+		fprintf(f,"%stalloc report on '%s' (total %6lu bytes in %3lu blocks)\n",
 			(max_depth < 0 ? "full " :""), name,
 			(unsigned long)talloc_total_size(ptr),
 			(unsigned long)talloc_total_blocks(ptr));
 		return;
 	}
 
-	fprintf(f, "%*s%-30s contains %6lu bytes in %3lu blocks (ref %d) %p\n", 
+	fprintf(f, "%*s%-30s contains %6lu bytes in %3lu blocks (ref %d) %p\n",
 		depth*4, "",
 		name,
 		(unsigned long)talloc_total_size(ptr),
@@ -1344,8 +1344,8 @@ void talloc_enable_leak_report_full(void)
 	atexit(talloc_report_null_full);
 }
 
-/* 
-   talloc and zero memory. 
+/*
+   talloc and zero memory.
 */
 void *_talloc_zero(const void *ctx, size_t size, const char *name)
 {
@@ -1359,7 +1359,7 @@ void *_talloc_zero(const void *ctx, size_t size, const char *name)
 }
 
 /*
-  memdup with a talloc. 
+  memdup with a talloc.
 */
 void *_talloc_memdup(const void *t, const void *p, size_t size, const char *name)
 {
diff --git a/misc/tools/osmocon/talloc.h b/misc/tools/osmocon/talloc.h
index f7f7643b8..efaceb183 100644
--- a/misc/tools/osmocon/talloc.h
+++ b/misc/tools/osmocon/talloc.h
@@ -1,16 +1,16 @@
 #ifndef _TALLOC_H_
 #define _TALLOC_H_
-/* 
+/*
    Unix SMB/CIFS implementation.
    Samba temporary memory allocation functions
 
    Copyright (C) Andrew Tridgell 2004-2005
    Copyright (C) Stefan Metzmacher 2006
-   
+
      ** NOTE! The following LGPL license applies to the talloc
      ** library. This does NOT imply that all of Samba is released
      ** under the LGPL
-   
+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
@@ -130,7 +130,7 @@ void *_talloc_reference(const void *context, const void *ptr);
 int talloc_unlink(const void *context, void *ptr);
 const char *talloc_set_name(const void *ptr, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
 void talloc_set_name_const(const void *ptr, const char *name);
-void *talloc_named(const void *context, size_t size, 
+void *talloc_named(const void *context, size_t size,
 		   const char *fmt, ...) PRINTF_ATTRIBUTE(3,4);
 void *talloc_named_const(const void *context, size_t size, const char *name);
 const char *talloc_get_name(const void *ptr);