@@ -3298,12 +3298,6 @@ PHP_FUNCTION(pg_lo_import)
3298
3298
link = FETCH_DEFAULT_LINK ();
3299
3299
CHECK_DEFAULT_LINK (link );
3300
3300
}
3301
- /* old calling convention, deprecated since PHP 4.2 */
3302
- else if (zend_parse_parameters_ex (ZEND_PARSE_PARAMS_QUIET , argc ,
3303
- "pr" , & file_in , & name_len , & pgsql_link ) == SUCCESS ) {
3304
- php_error_docref (NULL , E_NOTICE , "Old API is used" );
3305
- link = Z_RES_P (pgsql_link );
3306
- }
3307
3301
else {
3308
3302
WRONG_PARAM_COUNT ;
3309
3303
}
@@ -3384,7 +3378,7 @@ PHP_FUNCTION(pg_lo_export)
3384
3378
link = Z_RES_P (pgsql_link );
3385
3379
}
3386
3380
else if (zend_parse_parameters_ex (ZEND_PARSE_PARAMS_QUIET , argc ,
3387
- "rss " , & pgsql_link , & oid_string , & oid_strlen , & file_out , & name_len ) == SUCCESS ) {
3381
+ "rsp " , & pgsql_link , & oid_string , & oid_strlen , & file_out , & name_len ) == SUCCESS ) {
3388
3382
oid = (Oid )strtoul (oid_string , & end_ptr , 10 );
3389
3383
if ((oid_string + oid_strlen ) != end_ptr ) {
3390
3384
/* wrong integer format */
@@ -3414,26 +3408,6 @@ PHP_FUNCTION(pg_lo_export)
3414
3408
link = FETCH_DEFAULT_LINK ();
3415
3409
CHECK_DEFAULT_LINK (link );
3416
3410
}
3417
- else if (zend_parse_parameters_ex (ZEND_PARSE_PARAMS_QUIET , argc ,
3418
- "spr" , & oid_string , & oid_strlen , & file_out , & name_len , & pgsql_link ) == SUCCESS ) {
3419
- oid = (Oid )strtoul (oid_string , & end_ptr , 10 );
3420
- if ((oid_string + oid_strlen ) != end_ptr ) {
3421
- /* wrong integer format */
3422
- php_error_docref (NULL , E_NOTICE , "Wrong OID value passed" );
3423
- RETURN_FALSE ;
3424
- }
3425
- link = Z_RES_P (pgsql_link );
3426
- }
3427
- else if (zend_parse_parameters_ex (ZEND_PARSE_PARAMS_QUIET , argc ,
3428
- "lpr" , & oid_long , & file_out , & name_len , & pgsql_link ) == SUCCESS ) {
3429
- php_error_docref (NULL , E_NOTICE , "Old API is used" );
3430
- if (oid_long <= (zend_long )InvalidOid ) {
3431
- php_error_docref (NULL , E_NOTICE , "Invalid OID specified" );
3432
- RETURN_FALSE ;
3433
- }
3434
- oid = (Oid )oid_long ;
3435
- link = Z_RES_P (pgsql_link );
3436
- }
3437
3411
else {
3438
3412
zend_argument_count_error ("Requires 2 or 3 arguments, %d given" , ZEND_NUM_ARGS ());
3439
3413
RETURN_THROWS ();
0 commit comments