Skip to content

Commit 1920e45

Browse files
committed
Correct argnum, correct Oxford comma usage, fix incorrect space indentation
1 parent 5f870f2 commit 1920e45

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

ext/pgsql/pgsql.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1994,7 +1994,7 @@ PHP_FUNCTION(pg_fetch_all)
19941994
}
19951995

19961996
if (!(result_type & PGSQL_BOTH)) {
1997-
zend_argument_value_error(4, "must be one of PGSQL_ASSOC, PGSQL_NUM, or PGSQL_BOTH");
1997+
zend_argument_value_error(2, "must be one of PGSQL_ASSOC, PGSQL_NUM, or PGSQL_BOTH");
19981998
RETURN_THROWS();
19991999
}
20002000

@@ -2345,7 +2345,7 @@ PHP_FUNCTION(pg_lo_create)
23452345
default:
23462346
php_error_docref(NULL, E_NOTICE, "Invalid OID value passed");
23472347
RETURN_FALSE;
2348-
}
2348+
}
23492349
if ((pgsql_oid = lo_create(pgsql, wanted_oid)) == InvalidOid) {
23502350
php_error_docref(NULL, E_WARNING, "Unable to create PostgreSQL large object");
23512351
RETURN_FALSE;
@@ -2741,9 +2741,9 @@ PHP_FUNCTION(pg_lo_import)
27412741
default:
27422742
php_error_docref(NULL, E_NOTICE, "Invalid OID value passed");
27432743
RETURN_FALSE;
2744-
}
2744+
}
27452745

2746-
returned_oid = lo_import_with_oid(pgsql, file_in, wanted_oid);
2746+
returned_oid = lo_import_with_oid(pgsql, file_in, wanted_oid);
27472747

27482748
if (returned_oid == InvalidOid) {
27492749
RETURN_FALSE;
@@ -4503,7 +4503,7 @@ static php_pgsql_data_type php_pgsql_get_data_type(const char *type_name, size_t
45034503
static int php_pgsql_convert_match(const char *str, size_t str_len, const char *regex , size_t regex_len, int icase)
45044504
{
45054505
pcre2_code *re;
4506-
PCRE2_SIZE err_offset;
4506+
PCRE2_SIZE err_offset;
45074507
int res, errnumber;
45084508
uint32_t options = PCRE2_NO_AUTO_CAPTURE;
45094509
size_t i;
@@ -5263,8 +5263,8 @@ PHP_FUNCTION(pg_convert)
52635263

52645264
if (option & ~PGSQL_CONV_OPTS) {
52655265
zend_argument_value_error(4, "must be a valid bit mask of PGSQL_CONV_IGNORE_DEFAULT, "
5266-
"PGSQL_CONV_FORCE_NULL, or PGSQL_CONV_IGNORE_NOT_NULL");
5267-
RETURN_THROWS();
5266+
"PGSQL_CONV_FORCE_NULL, and PGSQL_CONV_IGNORE_NOT_NULL");
5267+
RETURN_THROWS();
52685268
}
52695269

52705270
if ((pg_link = (PGconn *)zend_fetch_resource2(Z_RES_P(pgsql_link), "PostgreSQL link", le_link, le_plink)) == NULL) {
@@ -5477,8 +5477,8 @@ PHP_FUNCTION(pg_insert)
54775477

54785478
if (option & ~(PGSQL_CONV_OPTS|PGSQL_DML_NO_CONV|PGSQL_DML_EXEC|PGSQL_DML_ASYNC|PGSQL_DML_STRING|PGSQL_DML_ESCAPE)) {
54795479
zend_argument_value_error(4, "must be a valid bit mask of PGSQL_CONV_FORCE_NULL, PGSQL_DML_NO_CONV, "
5480-
"PGSQL_DML_ESCAPE, PGSQL_DML_EXEC, PGSQL_DML_ASYNC or PGSQL_DML_STRING");
5481-
RETURN_THROWS();
5480+
"PGSQL_DML_ESCAPE, PGSQL_DML_EXEC, PGSQL_DML_ASYNC, and PGSQL_DML_STRING");
5481+
RETURN_THROWS();
54825482
}
54835483

54845484
if ((pg_link = (PGconn *)zend_fetch_resource2(Z_RES_P(pgsql_link), "PostgreSQL link", le_link, le_plink)) == NULL) {
@@ -5694,8 +5694,8 @@ PHP_FUNCTION(pg_update)
56945694

56955695
if (option & ~(PGSQL_CONV_OPTS|PGSQL_DML_NO_CONV|PGSQL_DML_EXEC|PGSQL_DML_STRING|PGSQL_DML_ESCAPE)) {
56965696
zend_argument_value_error(5, "must be a valid bit mask of PGSQL_CONV_FORCE_NULL, PGSQL_DML_NO_CONV, "
5697-
"PGSQL_DML_ESCAPE, PGSQL_DML_EXEC, PGSQL_DML_ASYNC or PGSQL_DML_STRING");
5698-
RETURN_THROWS();
5697+
"PGSQL_DML_ESCAPE, PGSQL_DML_EXEC, PGSQL_DML_ASYNC, and PGSQL_DML_STRING");
5698+
RETURN_THROWS();
56995699
}
57005700

57015701
if ((pg_link = (PGconn *)zend_fetch_resource2(Z_RES_P(pgsql_link), "PostgreSQL link", le_link, le_plink)) == NULL) {
@@ -5791,8 +5791,8 @@ PHP_FUNCTION(pg_delete)
57915791

57925792
if (option & ~(PGSQL_CONV_FORCE_NULL|PGSQL_DML_NO_CONV|PGSQL_DML_EXEC|PGSQL_DML_STRING|PGSQL_DML_ESCAPE)) {
57935793
zend_argument_value_error(4, "must be a valid bit mask of PGSQL_CONV_FORCE_NULL, PGSQL_DML_NO_CONV, "
5794-
"PGSQL_DML_ESCAPE, PGSQL_DML_EXEC, PGSQL_DML_ASYNC or PGSQL_DML_STRING");
5795-
RETURN_THROWS();
5794+
"PGSQL_DML_ESCAPE, PGSQL_DML_EXEC, PGSQL_DML_ASYNC, and PGSQL_DML_STRING");
5795+
RETURN_THROWS();
57965796
}
57975797

57985798
if ((pg_link = (PGconn *)zend_fetch_resource2(Z_RES_P(pgsql_link), "PostgreSQL link", le_link, le_plink)) == NULL) {
@@ -5936,7 +5936,7 @@ PHP_FUNCTION(pg_select)
59365936

59375937
if (option & ~(PGSQL_CONV_FORCE_NULL|PGSQL_DML_NO_CONV|PGSQL_DML_EXEC|PGSQL_DML_ASYNC|PGSQL_DML_STRING|PGSQL_DML_ESCAPE)) {
59385938
zend_argument_value_error(4, "must be a valid bit mask of PGSQL_CONV_FORCE_NULL, PGSQL_DML_NO_CONV, "
5939-
"PGSQL_DML_ESCAPE, PGSQL_DML_EXEC, PGSQL_DML_ASYNC or PGSQL_DML_STRING");
5939+
"PGSQL_DML_ESCAPE, PGSQL_DML_EXEC, PGSQL_DML_ASYNC, and PGSQL_DML_STRING");
59405940
RETURN_THROWS();
59415941
}
59425942
if (!(result_type & PGSQL_BOTH)) {

0 commit comments

Comments
 (0)