From 6922e6678d247af8c9d63df7a3db2fe83c328f7e Mon Sep 17 00:00:00 2001
From: Dirk Engling <erdgeist@erdgeist.org>
Date: Tue, 25 Feb 2014 00:30:31 +0100
Subject: Get rid of warnings uncovered with clangs -Weverything

---
 src/export/split_version_2.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'src/export/split_version_2.c')

diff --git a/src/export/split_version_2.c b/src/export/split_version_2.c
index ab6c8cf..2019762 100644
--- a/src/export/split_version_2.c
+++ b/src/export/split_version_2.c
@@ -7,19 +7,17 @@
 
 int main( int argc, char **args ) {
   char table[64], f[1024*1024];
-  int  outfiles[64], i, base = 0;
-  uint32_t fixed_columns = 0;
+  int  outfiles[64], i, base = 0, fixed_columns = 0;
   uint32_t *p = (uint32_t*)f;
 
-  if( argc > 1 ) base = atol( args[1] );
-  if( argc > 2 ) fixed_columns = atol( args[2] );
+  if( argc > 1 ) base = atoi( args[1] );
+  if( argc > 2 ) fixed_columns = atoi( args[2] );
 
   /* No output file yet valid */
   for( i=0; i<64; ++i ) outfiles[i] = -1;
 
   while( fgets( table, sizeof(table), stdin ) ) {
-    unsigned int file, strnr;
-    uint32_t count, columns;
+    int file, strnr, columns, count;
 
     table[strlen(table)-1] = 0;
 
@@ -32,15 +30,15 @@ int main( int argc, char **args ) {
       close(f_in);
     }
 
-    count = p[0],
-    columns = fixed_columns ? fixed_columns : p[1] / 4 - 1;
+    count = (int)*p,
+    columns = fixed_columns ? fixed_columns : (int)p[1] / 4 - 1;
 
     for( file=0; file<columns; ++file ) {
       uint32_t off;
 
       /* Create outfile, if it is not yet there */
       if( outfiles[file] == -1 ) {
-        sprintf( table, "%02d_unknown", file+base );
+        sprintf( table, "%02d_unknown", file + base );
         outfiles[file] = open( table, O_WRONLY | O_APPEND | O_CREAT, 0644 );
         if ( outfiles[file] == -1 ) {
           fprintf( stderr, "Can not create output file %s\n", table );
-- 
cgit v1.2.3