From 0ea0e8b915098a9ece5fbd168a8bb90f171e02dc Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Mon, 30 Jan 2012 09:22:25 +0000
Subject: [PATCH] declarations after statement (C90)

---
 applications/jpip/libopenjpip/metadata_manager.c | 9 +++++----
 applications/jpip/libopenjpip/metadata_manager.h | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/applications/jpip/libopenjpip/metadata_manager.c b/applications/jpip/libopenjpip/metadata_manager.c
index 1c5f03c5..5a831cee 100644
--- a/applications/jpip/libopenjpip/metadata_manager.c
+++ b/applications/jpip/libopenjpip/metadata_manager.c
@@ -28,10 +28,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "metadata_manager.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "metadata_manager.h"
 
 #ifdef SERVER
 #include "fcgi_stdio.h"
@@ -40,7 +40,7 @@
 #define FCGI_stdout stdout
 #define FCGI_stderr stderr
 #define logstream stderr
-#endif //SERVER
+#endif /*SERVER*/
 
 
 metadatalist_param_t * gene_metadatalist()
@@ -144,7 +144,7 @@ void delete_metadata( metadata_param_t **metadata)
   if((*metadata)->boxcontents)
     free((*metadata)->boxcontents);
 #ifndef SERVER
-  //  fprintf( logstream, "local log: Metadata-bin: %d deleted\n", (*metadata)->idx);
+  /*  fprintf( logstream, "local log: Metadata-bin: %d deleted\n", (*metadata)->idx);*/
 #endif
   free( *metadata);
 }
@@ -160,11 +160,12 @@ void insert_metadata_into_list( metadata_param_t *metabin, metadatalist_param_t
 
 void print_metadata( metadata_param_t *metadata)
 {
+  boxcontents_param_t *boxcont;
   fprintf( logstream, "metadata-bin %d info:\n", metadata->idx);
   print_allbox( metadata->boxlist);
   print_allplaceholder( metadata->placeholderlist);
  
-  boxcontents_param_t *boxcont = metadata->boxcontents;
+  boxcont = metadata->boxcontents;
   if( boxcont)
       fprintf( logstream, "box contents:\n"
 	       "\t offset: %lld %#llx\n" 
diff --git a/applications/jpip/libopenjpip/metadata_manager.h b/applications/jpip/libopenjpip/metadata_manager.h
index 4ce84bf2..8e717638 100644
--- a/applications/jpip/libopenjpip/metadata_manager.h
+++ b/applications/jpip/libopenjpip/metadata_manager.h
@@ -29,7 +29,7 @@
  */
 
 #ifndef   	METADATA_MANAGER_H_
-# define   	METADATA_MANAGER_H_
+#define   	METADATA_MANAGER_H_
 
 #include "box_manager.h"
 #include "placeholder_manager.h"