cvs: php-src(PHP_5_2) /ext/standard formatted_print.c /ext/sysvmsg sysvmsg.c

From: Date: Wed, 17 Jan 2007 08:25:32 +0000
Subject: cvs: php-src(PHP_5_2) /ext/standard formatted_print.c /ext/sysvmsg sysvmsg.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-42754@lists.php.net to get a copy of this message
tony2001 Wed Jan 17 08:25:32 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/sysvmsg sysvmsg.c /php-src/ext/standard formatted_print.c Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/sysvmsg.c?r1=1.20.2.3.2.5&r2=1.20.2.3.2.6&diff_format=u Index: php-src/ext/sysvmsg/sysvmsg.c diff -u php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.5 php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.6 --- php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.5 Mon Jan 8 22:34:07 2007 +++ php-src/ext/sysvmsg/sysvmsg.c Wed Jan 17 08:25:32 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvmsg.c,v 1.20.2.3.2.5 2007/01/08 22:34:07 nlopess Exp $ */ +/* $Id: sysvmsg.c,v 1.20.2.3.2.6 2007/01/17 08:25:32 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -24,7 +24,6 @@ #include "php.h" #include "php_globals.h" -#include "php_ini.h" #include "ext/standard/info.h" #include "php_sysvmsg.h" #include "ext/standard/php_var.h" @@ -100,16 +99,6 @@ # endif #endif -/* {{{ PHP_INI - */ -/* Remove comments and fill if you need to have entries in php.ini -PHP_INI_BEGIN() - STD_PHP_INI_ENTRY("sysvmsg.value", "42", PHP_INI_ALL, OnUpdateLong, global_value, zend_sysvmsg_globals, sysvmsg_globals) - STD_PHP_INI_ENTRY("sysvmsg.string", "foobar", PHP_INI_ALL, OnUpdateString, global_string, zend_sysvmsg_globals, sysvmsg_globals) -PHP_INI_END() -*/ -/* }}} */ - static void sysvmsg_release(zend_rsrc_list_entry *rsrc TSRMLS_DC) { sysvmsg_queue_t * mq = (sysvmsg_queue_t *) rsrc->ptr; @@ -136,7 +125,7 @@ { php_info_print_table_start(); php_info_print_table_row(2, "sysvmsg support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.20.2.3.2.5 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.20.2.3.2.6 $"); php_info_print_table_end(); } /* }}} */ @@ -288,7 +277,7 @@ } if (maxsize <= 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "maximum size of the message has to be greater then zero"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "maximum size of the message has to be greater than zero"); return; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/formatted_print.c?r1=1.82.2.1.2.13&r2=1.82.2.1.2.14&diff_format=u Index: php-src/ext/standard/formatted_print.c diff -u php-src/ext/standard/formatted_print.c:1.82.2.1.2.13 php-src/ext/standard/formatted_print.c:1.82.2.1.2.14 --- php-src/ext/standard/formatted_print.c:1.82.2.1.2.13 Sat Jan 13 16:31:17 2007 +++ php-src/ext/standard/formatted_print.c Wed Jan 17 08:25:32 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: formatted_print.c,v 1.82.2.1.2.13 2007/01/13 16:31:17 iliaa Exp $ */ +/* $Id: formatted_print.c,v 1.82.2.1.2.14 2007/01/17 08:25:32 tony2001 Exp $ */ #include <math.h> /* modf() */ #include "php.h" @@ -436,7 +436,7 @@ if (argnum <= 0) { efree(result); efree(args); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument number must be greater then zero."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument number must be greater than zero."); return NULL; } @@ -478,7 +478,7 @@ if ((width = php_sprintf_getnumber(format, &inpos)) < 0) { efree(result); efree(args); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Width must be greater then zero and less then %d.", INT_MAX); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Width must be greater than zero and less than %d.", INT_MAX); return NULL; } adjusting |= ADJ_WIDTH; @@ -495,7 +495,7 @@ if ((precision = php_sprintf_getnumber(format, &inpos)) < 0) { efree(result); efree(args); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Precision must be greater then zero and less then %d.", INT_MAX); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Precision must be greater than zero and less than %d.", INT_MAX); return NULL; } adjusting |= ADJ_PRECISION;

« previous php.cvs (#42754) next »