Skip to content

Commit 181d36c

Browse files
committed
Remove unused default_host argument from imap_headerinfo()
1 parent 00e44c4 commit 181d36c

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

ext/imap/php_imap.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1603,15 +1603,14 @@ PHP_FUNCTION(imap_undelete)
16031603
PHP_FUNCTION(imap_headerinfo)
16041604
{
16051605
zval *streamind;
1606-
zend_string *defaulthost = NULL;
16071606
int argc = ZEND_NUM_ARGS();
16081607
zend_long msgno, fromlength, subjectlength;
16091608
pils *imap_le_struct;
16101609
MESSAGECACHE *cache;
16111610
ENVELOPE *en;
16121611
char dummy[2000], fulladdress[MAILTMPLEN + 1];
16131612

1614-
if (zend_parse_parameters(argc, "rl|llS", &streamind, &msgno, &fromlength, &subjectlength, &defaulthost) == FAILURE) {
1613+
if (zend_parse_parameters(argc, "rl|ll", &streamind, &msgno, &fromlength, &subjectlength) == FAILURE) {
16151614
RETURN_THROWS();
16161615
}
16171616

ext/imap/php_imap.stub.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,7 @@ function imap_num_recent($stream_id): int|false {}
2727
function imap_headers($stream_id): array|false {}
2828

2929
/** @param resource $stream_id */
30-
function imap_headerinfo($stream_id, int $msg_no, int $from_length = 0, int $subject_length = 0, string $default_host = UNKNOWN): stdClass|false {}
31-
32-
/**
33-
* @param resource $stream_id
34-
* @alias imap_headerinfo
35-
*/
36-
function imap_header($stream_id, int $msg_no, int $from_length = 0, int $subject_length = 0, string $default_host = UNKNOWN): stdClass|false {}
30+
function imap_headerinfo($stream_id, int $msg_no, int $from_length = 0, int $subject_length = 0): stdClass|false {}
3731

3832
function imap_rfc822_parse_headers(string $headers, string $default_host = "UNKNOWN"): stdClass {}
3933

ext/imap/php_imap_arginfo.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: fe7adff9478c5e0e2ad9df6f34dc8a862a537cb3 */
2+
* Stub hash: e501d6869d721ad720a1a7c8b597b96e9591d5ed */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_open, 0, 0, 3)
55
ZEND_ARG_TYPE_INFO(0, mailbox, IS_STRING, 0)
@@ -37,11 +37,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imap_headerinfo, 0, 2, stdCl
3737
ZEND_ARG_TYPE_INFO(0, msg_no, IS_LONG, 0)
3838
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, from_length, IS_LONG, 0, "0")
3939
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, subject_length, IS_LONG, 0, "0")
40-
ZEND_ARG_TYPE_INFO(0, default_host, IS_STRING, 0)
4140
ZEND_END_ARG_INFO()
4241

43-
#define arginfo_imap_header arginfo_imap_headerinfo
44-
4542
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_imap_rfc822_parse_headers, 0, 1, stdClass, 0)
4643
ZEND_ARG_TYPE_INFO(0, headers, IS_STRING, 0)
4744
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, default_host, IS_STRING, 0, "\"UNKNOWN\"")
@@ -440,7 +437,6 @@ static const zend_function_entry ext_functions[] = {
440437
ZEND_FE(imap_num_recent, arginfo_imap_num_recent)
441438
ZEND_FE(imap_headers, arginfo_imap_headers)
442439
ZEND_FE(imap_headerinfo, arginfo_imap_headerinfo)
443-
ZEND_FALIAS(imap_header, imap_headerinfo, arginfo_imap_header)
444440
ZEND_FE(imap_rfc822_parse_headers, arginfo_imap_rfc822_parse_headers)
445441
ZEND_FE(imap_rfc822_write_address, arginfo_imap_rfc822_write_address)
446442
ZEND_FE(imap_rfc822_parse_adrlist, arginfo_imap_rfc822_parse_adrlist)

0 commit comments

Comments
 (0)