fix warnings regarding stream_ops order

Author: dwgebler

main/php_streams.h

@@ -117,7 +117,6 @@ typedef struct _php_stream_ops  {
 	ssize_t (*read)(php_stream *stream, char *buf, size_t count);
 	int    (*close)(php_stream *stream, int close_handle);
 	int    (*flush)(php_stream *stream);
-	int    (*sync)(php_stream *stream);
 
 	const char *label; /* label for this ops structure */
 
@@ -126,6 +125,7 @@ typedef struct _php_stream_ops  {
 	int (*cast)(php_stream *stream, int castas, void **ret);
 	int (*stat)(php_stream *stream, php_stream_statbuf *ssb);
 	int (*set_option)(php_stream *stream, int option, int value, void *ptrparam);
+        int (*sync)(php_stream *stream);
 } php_stream_ops;
 
 typedef struct _php_stream_wrapper_ops {

main/streams/glob_wrapper.c

@@ -190,7 +190,8 @@ const php_stream_ops  php_glob_stream_ops = {
 	php_glob_stream_rewind,
 	NULL, /* cast */
 	NULL, /* stat */
-	NULL  /* set_option */
+	NULL,  /* set_option */
+	NULL
 };
 
  /* {{{ php_glob_stream_opener */

main/streams/plain_wrapper.c

@@ -524,15 +524,17 @@ static int php_stdiop_close(php_stream *stream, int close_handle)
 static int php_stdiop_sync(php_stream *stream)
 {
 	php_stdio_stream_data *data = (php_stdio_stream_data*)stream->abstract;
+	int ret = 0;
 
 	assert(data != NULL);
 
 	if (data->file) {
-		fflush(data->file);
-		return fsync(fileno(data->file));
+		ret = fflush(data->file);
+		if (ret != 0) {
+		    return fsync(fileno(data->file));
+		}
 	}
-	return 0;
-	
+	return ret;	
 }
 
 static int php_stdiop_flush(php_stream *stream)
@@ -973,12 +975,12 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void
 PHPAPI php_stream_ops	php_stream_stdio_ops = {
 	php_stdiop_write, php_stdiop_read,
 	php_stdiop_close, php_stdiop_flush,
-	php_stdiop_sync,
 	"STDIO",
 	php_stdiop_seek,
 	php_stdiop_cast,
 	php_stdiop_stat,
-	php_stdiop_set_option
+	php_stdiop_set_option,
+	php_stdiop_sync,
 };
 /* }}} */