Merge remote-tracking branch 'refs/remotes/origin/master'

5 files changed, 11 insertions, 10 deletions

diff --git a/src/export/extract_version_1.c b/src/export/extract_version_1.c
index 0e03e1e..c727b4f 100644
--- a/src/export/extract_version_1.c
+++ b/src/export/extract_version_1.c
@@ -210,13 +210,13 @@ int main( )
     /* Write out results */
     for( i=0; i<14; ++i ) {
       /* if( g_state.outfill[i] > 1024*1024*6 ) printf( "Large: %s %zd\n", g_state.ort, g_state.outfill[i] ); */
-      write( g_state.outfiles[i], g_state.outbuf[i], g_state.outfill[i] );
+      (void)write( g_state.outfiles[i], g_state.outbuf[i], g_state.outfill[i] );
       g_state.outfill[i]  = 0;
     }
   }
 
   for( i=0; i<14; ++i ) {
-    write( g_state.outfiles[i], g_state.outbuf[i], g_state.outfill[i] );
+    (void)write( g_state.outfiles[i], g_state.outbuf[i], g_state.outfill[i] );
     close( g_state.outfiles[i] );
   }
 
diff --git a/src/export/extract_version_3.c b/src/export/extract_version_3.c
index c4914a7..329c1a8 100644
--- a/src/export/extract_version_3.c
+++ b/src/export/extract_version_3.c
@@ -113,11 +113,11 @@ int main( int args, char **argv )
         /* Open file and dump our de-"crypted" header and then rest of file */
         fh = open( filename, O_CREAT | O_TRUNC | O_WRONLY, 0644 );
         if( enc_len > header_len ) {
-            write( fh, df, enc_len );
-            write( fh, mf + enc_len, offset - old_offset - enc_len );
+            (void)write( fh, df, enc_len );
+            (void)write( fh, mf + enc_len, offset - old_offset - enc_len );
         } else {
-            write( fh, df, header_len );
-            write( fh, mf + header_len, offset - old_offset - header_len );
+            (void)write( fh, df, header_len );
+            (void)write( fh, mf + header_len, offset - old_offset - header_len );
         }
         close( fh );
     }
diff --git a/src/export/extract_version_4.c b/src/export/extract_version_4.c
index 735cb3a..252831a 100644
--- a/src/export/extract_version_4.c
+++ b/src/export/extract_version_4.c
@@ -50,7 +50,7 @@ error_continue:
       fprintf( stderr, "Could not open output file %s\n", respath );
       exit(1);
     }
-    write( resfile, output, z.total_out );
+    (void)write( resfile, output, z.total_out );
     close( resfile );
     offs += z.total_in;
 
diff --git a/src/export/split_version_2.c b/src/export/split_version_2.c
index 54e2313..6eafe55 100644
--- a/src/export/split_version_2.c
+++ b/src/export/split_version_2.c
@@ -237,16 +237,17 @@ int main( int args, char **argv ) {
     if( g_state.outfill[0] > limit )
       for( i=0; i<g_outfiles; ++i ) {
         if( g_state.outfill[i] > 1024*1024*6 ) printf( "Large: %zd\n", g_state.outfill[i] );
-        write( g_state.outfiles[i], g_state.outbuf[i], g_state.outfill[i] );
+        (void)write( g_state.outfiles[i], g_state.outbuf[i], g_state.outfill[i] );
         g_state.outfill[i]  = 0;
       }
   }
 
   for( i=0; i<g_outfiles; ++i ) {
-    write( g_state.outfiles[i], g_state.outbuf[i], g_state.outfill[i] );
+    (void)write( g_state.outfiles[i], g_state.outbuf[i], g_state.outfill[i] );
     close( g_state.outfiles[i] );
   }
   unmap_file( &data );
   unmap_file( &index );
 
+  return 0;
 }
diff --git a/src/export/split_version_3.c b/src/export/split_version_3.c
index 2019762..853d95d 100644
--- a/src/export/split_version_3.c
+++ b/src/export/split_version_3.c
@@ -49,7 +49,7 @@ int main( int argc, char **args ) {
       off = p[file+1];
       /* Look for end of this chunk, which is <count> strings long */
       for( strnr=0; strnr < count; ++strnr ) { while( f[off++] ) {}; f[off-1] = '\n'; }
-      write( outfiles[file], f + p[file+1], off - p[file+1] );
+      (void)write( outfiles[file], f + p[file+1], off - p[file+1] );
     }
   }