From ed2e84e2394b97f710710c6db0366d739422b0fe Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Mon, 22 Apr 2013 13:41:27 +0100 Subject: typo fixes (accommodate, parameter) --- ext/pdo/pdo_sql_parser.c | 4 ++-- ext/pdo/pdo_sql_parser.re | 4 ++-- ext/soap/php_sdl.c | 4 ++-- ext/sqlite3/libsqlite/sqlite3.c | 4 ++-- ext/sqlite3/sqlite3.c | 2 +- ext/standard/user_filters.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'ext') diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c index 4219762a4b..4c523506c4 100644 --- a/ext/pdo/pdo_sql_parser.c +++ b/ext/pdo/pdo_sql_parser.c @@ -761,9 +761,9 @@ int old_pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len, char while (SUCCESS == zend_hash_get_current_data(params, (void**)¶m)) { if(param->parameter) { convert_to_string(param->parameter); - /* accomodate a string that needs to be fully quoted + /* accommodate a string that needs to be fully quoted bind placeholders are at least 2 characters, so - the accomodate their own "'s + the accommodate their own "'s */ newbuffer_len += padding * Z_STRLEN_P(param->parameter); } diff --git a/ext/pdo/pdo_sql_parser.re b/ext/pdo/pdo_sql_parser.re index d4272d679b..80e3b4f95f 100644 --- a/ext/pdo/pdo_sql_parser.re +++ b/ext/pdo/pdo_sql_parser.re @@ -408,9 +408,9 @@ int old_pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len, char while (SUCCESS == zend_hash_get_current_data(params, (void**)¶m)) { if(param->parameter) { convert_to_string(param->parameter); - /* accomodate a string that needs to be fully quoted + /* accommodate a string that needs to be fully quoted bind placeholders are at least 2 characters, so - the accomodate their own "'s + the accommodate their own "'s */ newbuffer_len += padding * Z_STRLEN_P(param->parameter); } diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index 33e137cbbb..0ac4c2ed7a 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -40,8 +40,8 @@ static void delete_binding(void *binding); static void delete_binding_persistent(void *binding); static void delete_function(void *function); static void delete_function_persistent(void *function); -static void delete_parameter(void *paramater); -static void delete_parameter_persistent(void *paramater); +static void delete_parameter(void *parameter); +static void delete_parameter_persistent(void *parameter); static void delete_header(void *header); static void delete_header_persistent(void *header); static void delete_document(void *doc_ptr); diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c index d96367e212..cdcb48b5a9 100644 --- a/ext/sqlite3/libsqlite/sqlite3.c +++ b/ext/sqlite3/libsqlite/sqlite3.c @@ -93617,7 +93617,7 @@ SQLITE_PRIVATE int sqlite3IndexedByLookup(Parse *pParse, struct SrcList_item *pF ** without worrying about messing up the presistent representation ** of the view. ** -** (3) Add terms to the WHERE clause to accomodate the NATURAL keyword +** (3) Add terms to the WHERE clause to accommodate the NATURAL keyword ** on joins and the ON and USING clause of joins. ** ** (4) Scan the list of columns in the result set (pEList) looking @@ -96115,7 +96115,7 @@ SQLITE_PRIVATE void sqlite3CodeRowTriggerDirect( /* ** This is called to code the required FOR EACH ROW triggers for an operation ** on table pTab. The operation to code triggers for (INSERT, UPDATE or DELETE) -** is given by the op paramater. The tr_tm parameter determines whether the +** is given by the op parameter. The tr_tm parameter determines whether the ** BEFORE or AFTER triggers are coded. If the operation is an UPDATE, then ** parameter pChanges is passed the list of columns being modified. ** diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index df449d7380..2aef0414aa 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -1409,7 +1409,7 @@ static int register_bound_parameter_to_sqlite(struct php_sqlite3_bound_param *pa /* }}} */ /* {{{ proto bool SQLite3Stmt::bindParam(int parameter_number, mixed parameter [, int type]) - Bind Paramater to a stmt variable. */ + Bind Parameter to a stmt variable. */ PHP_METHOD(sqlite3stmt, bindParam) { php_sqlite3_stmt *stmt_obj; diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c index b009e67aa1..b44be124a1 100644 --- a/ext/standard/user_filters.c +++ b/ext/standard/user_filters.c @@ -474,7 +474,7 @@ static void php_stream_bucket_attach(int append, INTERNAL_FUNCTION_PARAMETERS) } else { php_stream_bucket_prepend(brigade, bucket TSRMLS_CC); } - /* This is a hack necessary to accomodate situations where bucket is appended to the stream + /* This is a hack necessary to accommodate situations where bucket is appended to the stream * multiple times. See bug35916.phpt for reference. */ if (bucket->refcount == 1) { -- cgit v1.2.1 From 04145dc2aa6eea37f7cd27ffa69ad3b2f52a65da Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Mon, 22 Apr 2013 14:05:24 +0100 Subject: typo fixes (argument) --- ext/intl/tests/badargs.phpt | 2 +- ext/pcre/pcrelib/NEWS | 2 +- ext/sqlite3/libsqlite/sqlite3.c | 2 +- ext/standard/tests/array/009.phpt | 2 +- ext/standard/tests/array/array_fill_keys_error.phpt | 4 ++-- ext/standard/tests/array/array_merge.phpt | 2 +- ext/standard/tests/array/array_walk_basic2.phpt | 2 +- ext/standard/tests/array/array_walk_recursive_basic2.phpt | 2 +- ext/standard/tests/class_object/class_exists_variation_001.phpt | 2 +- ext/standard/tests/class_object/class_exists_variation_002.phpt | 2 +- ext/standard/tests/class_object/trait_exists_variation_001.phpt | 2 +- ext/standard/tests/class_object/trait_exists_variation_002.phpt | 2 +- ext/standard/tests/file/005_error.phpt | 2 +- ext/standard/tests/file/fileinode_error.phpt | 4 ++-- ext/standard/tests/file/fstat_variation1.phpt | 2 +- ext/standard/tests/file/fstat_variation2.phpt | 2 +- ext/standard/tests/file/fstat_variation3.phpt | 2 +- ext/standard/tests/file/fstat_variation4.phpt | 2 +- ext/standard/tests/file/fstat_variation5.phpt | 2 +- ext/standard/tests/file/fstat_variation6.phpt | 2 +- ext/standard/tests/file/fstat_variation7.phpt | 2 +- ext/standard/tests/strings/chunk_split_error.phpt | 2 +- ext/zlib/tests/gzfile_variation1.phpt | 2 +- ext/zlib/tests/gzfile_variation10.phpt | 2 +- ext/zlib/tests/gzfile_variation11.phpt | 2 +- ext/zlib/tests/gzfile_variation12.phpt | 2 +- ext/zlib/tests/gzfile_variation13.phpt | 2 +- ext/zlib/tests/gzfile_variation14.phpt | 2 +- ext/zlib/tests/gzfile_variation2.phpt | 2 +- ext/zlib/tests/gzfile_variation3.phpt | 2 +- ext/zlib/tests/gzfile_variation4.phpt | 2 +- ext/zlib/tests/gzfile_variation5.phpt | 2 +- ext/zlib/tests/gzfile_variation6.phpt | 2 +- ext/zlib/tests/gzfile_variation7.phpt | 2 +- ext/zlib/tests/gzfile_variation8.phpt | 2 +- ext/zlib/tests/gzfile_variation9.phpt | 2 +- ext/zlib/tests/readgzfile_variation1.phpt | 2 +- ext/zlib/tests/readgzfile_variation10.phpt | 2 +- ext/zlib/tests/readgzfile_variation11.phpt | 2 +- ext/zlib/tests/readgzfile_variation12.phpt | 2 +- ext/zlib/tests/readgzfile_variation13.phpt | 2 +- ext/zlib/tests/readgzfile_variation14.phpt | 2 +- ext/zlib/tests/readgzfile_variation2.phpt | 2 +- ext/zlib/tests/readgzfile_variation3.phpt | 2 +- ext/zlib/tests/readgzfile_variation4.phpt | 2 +- ext/zlib/tests/readgzfile_variation5.phpt | 2 +- ext/zlib/tests/readgzfile_variation6.phpt | 2 +- ext/zlib/tests/readgzfile_variation7.phpt | 2 +- ext/zlib/tests/readgzfile_variation8.phpt | 2 +- ext/zlib/tests/readgzfile_variation9.phpt | 2 +- 50 files changed, 52 insertions(+), 52 deletions(-) (limited to 'ext') diff --git a/ext/intl/tests/badargs.phpt b/ext/intl/tests/badargs.phpt index 9232bbf0c1..264af73acc 100644 --- a/ext/intl/tests/badargs.phpt +++ b/ext/intl/tests/badargs.phpt @@ -1,5 +1,5 @@ --TEST-- -Check that bad argumens return the same +Check that bad arguments return the same --SKIPIF-- --FILE-- diff --git a/ext/pcre/pcrelib/NEWS b/ext/pcre/pcrelib/NEWS index ebd9c5ec9d..082139f222 100644 --- a/ext/pcre/pcrelib/NEWS +++ b/ext/pcre/pcrelib/NEWS @@ -591,7 +591,7 @@ some of the new functionality in Perl 5.005. Another (I hope this is the last!) change has been made to the API for the pcre_compile() function. An additional argument has been added to make it possible to pass over a pointer to character tables built in the current -locale by pcre_maketables(). To use the default tables, this new arguement +locale by pcre_maketables(). To use the default tables, this new argument should be passed as NULL. IMPORTANT FOR THOSE UPGRADING FROM VERSION 2.05 diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c index cdcb48b5a9..ef64f6dc2c 100644 --- a/ext/sqlite3/libsqlite/sqlite3.c +++ b/ext/sqlite3/libsqlite/sqlite3.c @@ -93544,7 +93544,7 @@ static u8 minMaxQuery(Select *p){ /* ** The select statement passed as the first argument is an aggregate query. -** The second argment is the associated aggregate-info object. This +** The second argument is the associated aggregate-info object. This ** function tests if the SELECT is of the form: ** ** SELECT count(*) FROM diff --git a/ext/standard/tests/array/009.phpt b/ext/standard/tests/array/009.phpt index f88f8763fa..7b3bba2261 100644 --- a/ext/standard/tests/array/009.phpt +++ b/ext/standard/tests/array/009.phpt @@ -94,7 +94,7 @@ var_dump( current($temp_array, $temp_array) ); var_dump( reset($temp_array, $temp_array) ); var_dump( next($temp_array, $temp_array) ); -// invalid args type, valid arguement: array +// invalid args type, valid argument: array $int_var = 1; $float_var = 1.5; $string = "string"; diff --git a/ext/standard/tests/array/array_fill_keys_error.phpt b/ext/standard/tests/array/array_fill_keys_error.phpt index 31a03e7f5f..012a729d62 100644 --- a/ext/standard/tests/array/array_fill_keys_error.phpt +++ b/ext/standard/tests/array/array_fill_keys_error.phpt @@ -20,7 +20,7 @@ var_dump( array_fill_keys($keys, $val, $extra_arg) ); echo "\n-- Testing array_fill_keys() function with less than expected no. of arguments --\n"; var_dump( array_fill_keys($keys) ); -echo "\n-- Testing array_fill_keys() function with no argumets --\n"; +echo "\n-- Testing array_fill_keys() function with no arguments --\n"; var_dump( array_fill_keys() ); echo "Done"; @@ -38,7 +38,7 @@ NULL Warning: array_fill_keys() expects exactly 2 parameters, 1 given in %sarray_fill_keys_error.php on line %d NULL --- Testing array_fill_keys() function with no argumets -- +-- Testing array_fill_keys() function with no arguments -- Warning: array_fill_keys() expects exactly 2 parameters, 0 given in %sarray_fill_keys_error.php on line %d NULL diff --git a/ext/standard/tests/array/array_merge.phpt b/ext/standard/tests/array/array_merge.phpt index b718386da1..30830de2b3 100644 --- a/ext/standard/tests/array/array_merge.phpt +++ b/ext/standard/tests/array/array_merge.phpt @@ -79,7 +79,7 @@ echo "\n*** Testing array_merge() with typecasting non-array to array ***\n"; var_dump(array_merge($begin_array[4], (array)"type1", (array)10, (array)12.34)); echo "\n*** Testing error conditions ***"; -/* Invalid argumens */ +/* Invalid arguments */ var_dump(array_merge()); var_dump(array_merge(100, 200)); var_dump(array_merge($begin_array[0], $begin_array[1], 100)); diff --git a/ext/standard/tests/array/array_walk_basic2.phpt b/ext/standard/tests/array/array_walk_basic2.phpt index e856b580ba..3ef15605e7 100644 --- a/ext/standard/tests/array/array_walk_basic2.phpt +++ b/ext/standard/tests/array/array_walk_basic2.phpt @@ -25,7 +25,7 @@ function test_alter(&$item, $key, $prefix) // with proper type var_dump($item); // value var_dump($key); // key - var_dump($prefix); // additional agument passed to callback function + var_dump($prefix); // additional argument passed to callback function echo "\n"; // new line to separate the output between each element } diff --git a/ext/standard/tests/array/array_walk_recursive_basic2.phpt b/ext/standard/tests/array/array_walk_recursive_basic2.phpt index c71d92b456..a049c0b812 100644 --- a/ext/standard/tests/array/array_walk_recursive_basic2.phpt +++ b/ext/standard/tests/array/array_walk_recursive_basic2.phpt @@ -25,7 +25,7 @@ function test_alter(&$item, $key, $prefix) // with proper type var_dump($item); // value var_dump($key); // key - var_dump($prefix); // additional agument passed to callback function + var_dump($prefix); // additional argument passed to callback function echo "\n"; // new line to separate the output between each element } diff --git a/ext/standard/tests/class_object/class_exists_variation_001.phpt b/ext/standard/tests/class_object/class_exists_variation_001.phpt index c9146ba9f7..52a3584763 100644 --- a/ext/standard/tests/class_object/class_exists_variation_001.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_001.phpt @@ -1,5 +1,5 @@ --TEST-- -Test class_exists() function : usage variations - unexpected types for agument 1 +Test class_exists() function : usage variations - unexpected types for argument 1 --FILE--