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

[Jani Taskinen]

sniper          Thu Aug 18 08:37:25 2005 EDT

  Modified files:              
    /php-src/ext/ftp    ftp.c 
  Log:
  - Removed EOLs from error messages
  
http://cvs.php.net/diff.php/php-src/ext/ftp/ftp.c?r1=1.112&r2=1.113&ty=u
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.112 php-src/ext/ftp/ftp.c:1.113
--- php-src/ext/ftp/ftp.c:1.112 Wed Aug  3 10:07:10 2005
+++ php-src/ext/ftp/ftp.c       Thu Aug 18 08:37:24 2005
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ftp.c,v 1.112 2005/08/03 14:07:10 sniper Exp $ */
+/* $Id: ftp.c,v 1.113 2005/08/18 12:37:24 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -148,7 +148,7 @@
        size = sizeof(ftp->localaddr);
        memset(&ftp->localaddr, 0, size);
        if (getsockname(ftp->fd, (struct sockaddr*) &ftp->localaddr, &size) == 
-1) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "getsockname 
failed: %s (%d)\n", strerror(errno), errno);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "getsockname 
failed: %s (%d)", strerror(errno), errno);
                goto bail;
        }
 
@@ -808,7 +808,7 @@
 
        if (resumepos > 0) {
                if (resumepos > 2147483647) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot 
handle files greater then 2147483647 bytes.\n");
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot 
handle files greater then 2147483647 bytes.");
                        goto bail;
                }
                sprintf(arg, "%u", resumepos);
@@ -905,7 +905,7 @@
 
        if (startpos > 0) {
                if (startpos > 2147483647) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot 
handle files with a size greater then 2147483647 bytes.\n");
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot 
handle files with a size greater then 2147483647 bytes.");
                        goto bail;
                }
                sprintf(arg, "%u", startpos);
@@ -1384,7 +1384,7 @@
        sa = (struct sockaddr *) &ftp->localaddr;
        /* bind/listen */
        if ((fd = socket(sa->sa_family, SOCK_STREAM, 0)) == -1) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "socket() failed: 
%s (%d)\n", strerror(errno), errno);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "socket() failed: 
%s (%d)", strerror(errno), errno);
                goto bail;
        }
 
@@ -1399,7 +1399,7 @@
                tv.tv_sec = ftp->timeout_sec;
                tv.tv_usec = 0;
                if (php_connect_nonb(fd, (struct sockaddr*) &ftp->pasvaddr, 
size, &tv) == -1) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"php_connect_nonb() failed: %s (%d)\n", strerror(errno), errno);
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"php_connect_nonb() failed: %s (%d)", strerror(errno), errno);
                        goto bail;
                }
 
@@ -1417,17 +1417,17 @@
        size = php_sockaddr_size(&addr);
 
        if (bind(fd, (struct sockaddr*) &addr, size) == -1) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "bind() failed: %s 
(%d)\n", strerror(errno), errno);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "bind() failed: %s 
(%d)", strerror(errno), errno);
                goto bail;
        }
 
        if (getsockname(fd, (struct sockaddr*) &addr, &size) == -1) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "getsockname() 
failed: %s (%d)\n", strerror(errno), errno);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "getsockname() 
failed: %s (%d)", strerror(errno), errno);
                goto bail;
        }
 
        if (listen(fd, 5) == -1) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "listen() failed: 
%s (%d)\n", strerror(errno), errno);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "listen() failed: 
%s (%d)", strerror(errno), errno);
                goto bail;
        }
 
@@ -1702,7 +1702,7 @@
                 * since php is 32 bit by design, we bail out with warning
                 */
                if (resumepos > 2147483647) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot 
handle files greater then 2147483648 bytes.\n");
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot 
handle files greater then 2147483648 bytes.");
                        goto bail;
                }
                sprintf(arg, "%u", resumepos);
@@ -1820,7 +1820,7 @@
        }
        if (startpos > 0) {
                if (startpos > 2147483647) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot 
handle files with a size greater then 2147483647 bytes.\n");
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot 
handle files with a size greater then 2147483647 bytes.");
                        goto bail;
                }
                sprintf(arg, "%u", startpos);

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