yet another cleaning pass

[simgrid.git] / examples / msg / io / file.c

diff --git a/examples/msg/io/file.c b/examples/msg/io/file.c
index e42f2b6..c72e615 100644 (file)
--- a/examples/msg/io/file.c
+++ b/examples/msg/io/file.c
@@ -20,16 +20,11 @@
 #define FILENAME3 "/home/doc/simgrid/examples/platforms/g5k_cabinets.xml"
 #define FILENAME4 "/home/doc/simgrid/examples/platforms/nancy.xml"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "simgrid/msg.h"
 
-int host(int argc, char *argv[]);
+XBT_LOG_NEW_DEFAULT_CATEGORY(io_file, "Messages specific for this io example");
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(io_file,
-                             "Messages specific for this io example");
-
-int host(int argc, char *argv[])
+static int host(int argc, char *argv[])
 {
   msg_file_t file = NULL;
   sg_size_t read,write;
@@ -65,32 +60,27 @@ int host(int argc, char *argv[])
 
   /* Write 100KB in file from the current position, i.e, end of file or 10MB */
   write = MSG_file_write(file, 100000);
-  XBT_INFO("\tHave written %llu in '%s'. Size now is: %llu",write,filename,
-           MSG_file_get_size(file));
+  XBT_INFO("\tHave written %llu in '%s'. Size now is: %llu",write,filename, MSG_file_get_size(file));
 
 
   XBT_INFO("\tCapacity of the storage element '%s' is stored on: %llu / %llu",
             filename, MSG_storage_get_used_size(st), MSG_storage_get_size(st));
 
   /* rewind to the beginning of the file */
-  XBT_INFO("\tComing back to the beginning of the stream for file '%s'",
-           filename);
+  XBT_INFO("\tComing back to the beginning of the stream for file '%s'", filename);
   MSG_file_seek(file, 0, SEEK_SET);
 
   /* Try to read 110KB */
   read = MSG_file_read(file, 110000);
-  XBT_INFO("\tHave read %llu from '%s' (of size %llu)",read,filename,
-      MSG_file_get_size(file));
+  XBT_INFO("\tHave read %llu from '%s' (of size %llu)",read,filename, MSG_file_get_size(file));
 
   /* rewind once again to the beginning of the file */
-  XBT_INFO("\tComing back to the beginning of the stream for file '%s'",
-           filename);
+  XBT_INFO("\tComing back to the beginning of the stream for file '%s'", filename);
   MSG_file_seek(file, 0, SEEK_SET);
 
   /* Write 110KB in file from the current position, i.e, end of file or 10MB */
   write = MSG_file_write(file, 110000);
-  XBT_INFO("\tHave written %llu in '%s'. Size now is: %llu", write,filename,
-      MSG_file_get_size(file));
+  XBT_INFO("\tHave written %llu in '%s'. Size now is: %llu", write,filename, MSG_file_get_size(file));
 
   XBT_INFO("\tCapacity of the storage element '%s' is stored on: %llu / %llu",
             filename, MSG_storage_get_used_size(st), MSG_storage_get_size(st));
@@ -98,28 +88,25 @@ int host(int argc, char *argv[])
   XBT_INFO("\tClose file '%s'",filename);
   MSG_file_close(file);
 
-
   return 0;
 }
 
 int main(int argc, char **argv)
 {
-  int i,res;
   MSG_init(&argc, argv);
   MSG_create_environment(argv[1]);
   xbt_dynar_t hosts =  MSG_hosts_as_dynar();
   MSG_function_register("host", host);
   unsigned long nb_hosts = xbt_dynar_length(hosts);
   XBT_INFO("Number of host '%lu'",nb_hosts);
-  for(i = 0 ; i<nb_hosts; i++)
-  {
+  for(int i = 0 ; i<nb_hosts; i++){
     char* name_host = bprintf("%d",i);
     MSG_process_create( name_host, host, NULL, xbt_dynar_get_as(hosts,i,msg_host_t) );
     free(name_host);
   }
   xbt_dynar_free(&hosts);
 
-  res = MSG_main();
+  int res = MSG_main();
   XBT_INFO("Simulation time %g", MSG_get_clock());
   return res != MSG_OK;
 }