summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2007-01-17 08:25:32 +0000
committerAntony Dovgal <tony2001@php.net>2007-01-17 08:25:32 +0000
commitd6a4586197b74aa802b704bae525ecc3295f9fff (patch)
tree17de4d87e3625cd295ced2bdcd6422569d388af1
parentb4f76016fd12c0ce9a34aea9cbd2eb96a7124939 (diff)
downloadphp-git-d6a4586197b74aa802b704bae525ecc3295f9fff.tar.gz
MFH
-rw-r--r--ext/standard/formatted_print.c6
-rw-r--r--ext/sysvmsg/sysvmsg.c13
2 files changed, 4 insertions, 15 deletions
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index 915f4979d0..ce8909473e 100644
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -436,7 +436,7 @@ php_formatted_print(int ht, int *len, int use_array, int format_offset TSRMLS_DC
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 @@ php_formatted_print(int ht, int *len, int use_array, int format_offset TSRMLS_DC
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 @@ php_formatted_print(int ht, int *len, int use_array, int format_offset TSRMLS_DC
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;
diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c
index 010638c85a..94b8e65fbc 100644
--- a/ext/sysvmsg/sysvmsg.c
+++ b/ext/sysvmsg/sysvmsg.c
@@ -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 @@ ZEND_GET_MODULE(sysvmsg)
# 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;
@@ -288,7 +277,7 @@ PHP_FUNCTION(msg_receive)
}
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;
}