diff options
| author | Zeev Suraski <zeev@php.net> | 1999-08-02 19:17:14 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-08-02 19:17:14 +0000 |
| commit | 3cb1eb047187d53688545ae6f64d4df880298e72 (patch) | |
| tree | 7fb20f178b9df5a33a83a2b7537f5614910697c0 /ext/standard/mail.c | |
| parent | 07e0885519ccabbd9cebfce7223be657171a6629 (diff) | |
| download | php-git-3cb1eb047187d53688545ae6f64d4df880298e72.tar.gz | |
Removed '3' from key functions in PHP (maintained compatibility through
php3_compat.h)
Diffstat (limited to 'ext/standard/mail.c')
| -rw-r--r-- | ext/standard/mail.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/standard/mail.c b/ext/standard/mail.c index 9e7172fa71..73ba38aa6c 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -70,7 +70,7 @@ PHP_FUNCTION(mail) if (argv[0]->value.str.val) { to = argv[0]->value.str.val; } else { - php3_error(E_WARNING, "No to field in mail command"); + php_error(E_WARNING, "No to field in mail command"); RETURN_FALSE; } @@ -79,7 +79,7 @@ PHP_FUNCTION(mail) if (argv[1]->value.str.val) { subject = argv[1]->value.str.val; } else { - php3_error(E_WARNING, "No subject field in mail command"); + php_error(E_WARNING, "No subject field in mail command"); RETURN_FALSE; } @@ -89,7 +89,7 @@ PHP_FUNCTION(mail) message = argv[2]->value.str.val; } else { /* this is not really an error, so it is allowed. */ - php3_error(E_WARNING, "No message string in mail command"); + php_error(E_WARNING, "No message string in mail command"); message = NULL; } @@ -118,7 +118,7 @@ int _php3_mail(char *to, char *subject, char *message, char *headers) #if MSVC5 if (TSendMail(INI_STR("SMTP"), &tsm_err, headers, subject, to, message) != SUCCESS){ - php3_error(E_WARNING, GetSMErrorText(tsm_err)); + php_error(E_WARNING, GetSMErrorText(tsm_err)); return 0; } #else @@ -141,7 +141,7 @@ int _php3_mail(char *to, char *subject, char *message, char *headers) return 1; } } else { - php3_error(E_WARNING, "Could not execute mail delivery program"); + php_error(E_WARNING, "Could not execute mail delivery program"); return 0; } #endif @@ -153,7 +153,7 @@ PHP_MINFO_FUNCTION(mail) #if MSVC5 PUTS("Internal Sendmail support for Windows 4"); #else - php3_printf("Path to sendmail: <tt>%s</tt>", INI_STR("sendmail_path")); + php_printf("Path to sendmail: <tt>%s</tt>", INI_STR("sendmail_path")); #endif } |