[PHP-CVS] cvs: php-src /ext/standard file.c

[Wez Furlong]

wez             Wed Jan 14 09:37:39 2004 EDT

  Modified files:              
    /php-src/ext/standard       file.c 
  Log:
  Remove stale code from flock();
  spotted by Hartmut.
  
  
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.375 php-src/ext/standard/file.c:1.376
--- php-src/ext/standard/file.c:1.375   Wed Jan 14 09:25:01 2004
+++ php-src/ext/standard/file.c Wed Jan 14 09:37:38 2004
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: file.c,v 1.375 2004/01/14 14:25:01 wez Exp $ */
+/* $Id: file.c,v 1.376 2004/01/14 14:37:38 wez Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -247,7 +247,7 @@
 PHP_FUNCTION(flock)
 {
        zval *arg1, *arg3 = NULL;
-       int fd, act;
+       int act;
        php_stream *stream;
        long operation = 0;
 
@@ -257,10 +257,6 @@
 
        php_stream_from_zval(stream, &arg1);
 
-       if (php_stream_cast(stream, PHP_STREAM_AS_FD, (void*)&fd, 1) == FAILURE) {
-               RETURN_FALSE;
-       }
-
        act = operation & 3;
        if (act < 1 || act > 3) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal operation 
argument");

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php