declarations after statement (C90)

[openjpeg.git] / applications / jpip / libopenjpip / metadata_manager.c

diff --git a/applications/jpip/libopenjpip/metadata_manager.c b/applications/jpip/libopenjpip/metadata_manager.c
index aa15e335bc66d153cb74e2042d1274eed46c9eea..5a831ceea9c3eefc93be47e4b224ad693a8cade0 100644 (file)
--- a/applications/jpip/libopenjpip/metadata_manager.c
+++ b/applications/jpip/libopenjpip/metadata_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: metadata_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id: metadata_manager.c 53 2011-05-09 16:55:39Z kaori $
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
@@ -28,12 +28,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "metadata_manager.h"
+#include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <string.h>
-#include "metadata_manager.h"
 
 #ifdef SERVER
 #include "fcgi_stdio.h"
@@ -42,7 +40,7 @@
 #define FCGI_stdout stdout
 #define FCGI_stderr stderr
 #define logstream stderr
-#endif //SERVER
+#endif /*SERVER*/
 
 
 metadatalist_param_t * gene_metadatalist()
@@ -66,14 +64,12 @@ metadatalist_param_t * const_metadatalist( int fd)
   placeholderlist_param_t *phldlist;
   placeholder_param_t *phld;
   int idx;
-  struct stat sb;
-  
-  if( fstat( fd, &sb) == -1){
-    fprintf( FCGI_stdout, "Reason: Target broken (fstat error)\r\n");
-    return NULL;
-  }
+  Byte8_t filesize;
 
-  if( !(toplev_boxlist = get_boxstructure( fd, 0, sb.st_size))){
+  if(!(filesize = get_filesize( fd)))
+    return NULL;
+  
+  if( !(toplev_boxlist = get_boxstructure( fd, 0, filesize))){
     fprintf( FCGI_stderr, "Error: Not correctl JP2 format\n");
     return NULL;
   }
@@ -148,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);
 }
@@ -164,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" 
@@ -218,8 +215,9 @@ metadata_param_t * search_metadata( int idx, metadatalist_param_t *list)
 int search_metadataidx( char boxtype[4], metadatalist_param_t *list)
 {
   metadata_param_t *ptr;
+  int i;
 
-  for( int i=0; i<4; i++)
+  for( i=0; i<4; i++)
     if( boxtype[i] == '_')
       boxtype[i] = ' ';