Apply another patch from Kaori, about return value from write/fwrite. Thanks
authorMathieu Malaterre <mathieu.malaterre@gmail.com>
Fri, 23 Dec 2011 08:30:36 +0000 (08:30 +0000)
committerMathieu Malaterre <mathieu.malaterre@gmail.com>
Fri, 23 Dec 2011 08:30:36 +0000 (08:30 +0000)
applications/jpip/CHANGES
applications/jpip/libopenjpip/jpipstream_manager.c
applications/jpip/libopenjpip/msgqueue_manager.c
applications/jpip/libopenjpip/openjpip.c

index 5d3fb0c6e4346925eb53fba439ee1159a99acf27..d5cb0663b8466321f096135876742a27456e3e9f 100644 (file)
@@ -7,6 +7,7 @@ What's New for OpenJPIP
 
 December 22, 2011
 * [kaori] fixed auxtrans_manager to enable MAC
+* [kaori] warnings due to disregarding return value are removed
 
 November 30, 2011
 + [kaori] TCP return (http-tcp) implemented
index bb1418f7474705de473bdd19ca13711d34250422..9a5f91fe34f2b8ad428ef14fb16239e4e4ceeff8 100644 (file)
@@ -65,7 +65,8 @@ void save_codestream( Byte_t *codestream, Byte8_t streamlen, char *fmt)
   sprintf( filename, "%4d%02d%02d%02d%02d%02d.%.3s", t_st->tm_year+1900, t_st->tm_mon+1, t_st->tm_mday, t_st->tm_hour, t_st->tm_min, t_st->tm_sec, fmt);
 
   fp = fopen( filename, "wb");
-  fwrite( codestream, streamlen, 1, fp);
+  if( fwrite( codestream, streamlen, 1, fp) != 1)
+    fprintf( stderr, "Error: failed to write codestream to file %s\n", filename);
   fclose( fp);
 }
 
index 279054f68b4dc15daaea00bd356f534f5c4081b3..6421ce01bb851d6592dba3db7edb1f7c4eeee3b0 100644 (file)
@@ -484,7 +484,10 @@ void add_vbas_with_bytelen_stream( Byte8_t code, int bytelength, int tmpfd)
     seg = ( code >> (n*7)) & 0x7f;
     if( n)
       seg |= 0x80;
-    write( tmpfd, ( Byte4_t *)&seg, 1);
+    if( write( tmpfd, ( Byte4_t *)&seg, 1) != 1){
+      fprintf( FCGI_stderr, "Error: failed to write vbas\n");
+      return;
+    }
     n--;
   }
 }
@@ -532,7 +535,10 @@ void add_bigendian_bytestream( Byte8_t code, int bytelength, int tmpfd)
   n = bytelength - 1;
   while( n >= 0) {
     seg = ( code >> (n*8)) & 0xff;
-    write( tmpfd, ( Byte4_t *)&seg, 1);
+    if( write( tmpfd, ( Byte4_t *)&seg, 1) != 1){
+      fprintf( FCGI_stderr, "ERROR: failed to write bigendian_bytestream\n");
+      return;
+    }
     n--;
   }
 }
index df1e3eb6b292480c58a534ca4ee470c8af3aab00..f19d7aea9021ea5e6d850e25b376126bf47d4d9c 100644 (file)
@@ -147,7 +147,9 @@ void send_responsedata( server_record_t *rec, QR_t *qr)
       return;
     }
   
-  fwrite( jpipstream, len_of_jpipstream, 1, FCGI_stdout);
+  if( fwrite( jpipstream, len_of_jpipstream, 1, FCGI_stdout) != 1)
+    fprintf( FCGI_stderr, "Error: failed to write jpipstream\n");
+
   free( jpipstream);
   return;
 }
@@ -160,7 +162,8 @@ void add_EORmsg( int fd, QR_t *qr)
     EOR[0] = 0x00;   
     EOR[1] = is_allsent( *(qr->channel->cachemodel)) ? 0x01 : 0x02;
     EOR[2] = 0x00;
-    write( fd, EOR, 3);
+    if( write( fd, EOR, 3) != 3)
+      fprintf( FCGI_stderr, "Error: failed to write EOR message\n");
   }
 }