Merge branch 'master' into cooking

diff --git a/ftepp.c b/ftepp.c
index b974f4fa83a81338b4b080b8e35eb92da8a57afe..8f452754d74b85b3f2787cfba12ee6ddbba112b6 100644 (file)
--- a/ftepp.c
+++ b/ftepp.c
@@ -837,7 +837,7 @@ static bool ftepp_macro_expand(ftepp_t *ftepp, ppmacro *macro, macroparam *param
                         macro_params_find(macro, macro->output[o+1]->value, &pi))
                     {
                         ++o;
-                        
+
                         ftepp_stringify(ftepp, &params[pi]);
                         break;
                     }

diff --git a/stat.c b/stat.c
index bf92c98db416be3c7fec695c706d8a3aaecc13dd..650bccdf040a0f83a324c70b94a545086d70aef4 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -141,7 +141,7 @@ void *stat_mem_allocate(size_t size, size_t line, const char *file, const char *
     info->expr = expr;
     info->prev = NULL;
     info->next = stat_mem_block_root;
-    
+
     /* Write identifier */
     memcpy(info + 1, IDENT_MEM, IDENT_SIZE);
 
@@ -167,7 +167,7 @@ void *stat_mem_allocate(size_t size, size_t line, const char *file, const char *
 void stat_mem_deallocate(void *ptr, size_t line, const char *file) {
     stat_mem_block_t *info  = NULL;
     char             *ident = (char *)ptr - IDENT_SIZE;
-    
+
     if (GMQCC_UNLIKELY(!ptr))
         return;
 
@@ -176,7 +176,7 @@ void stat_mem_deallocate(void *ptr, size_t line, const char *file) {
     if (!strcmp(ident, IDENT_VEC)) {
         vector_t         *vec   = (vector_t*)((char *)ptr - IDENT_VEC_TOP);
         stat_mem_block_t *block = (stat_mem_block_t*)((char *)vec - IDENT_MEM_TOP);
-        
+
         VALGRIND_MAKE_MEM_DEFINED(block, sizeof(stat_mem_block_t));
         con_err("internal warning: invalid use of mem_d:\n");
         con_err("internal warning:    vector (used elements: %u, allocated elements: %u)\n",