]>
Commit | Line | Data |
---|---|---|
68abf4df | 1 | --- php4/ext/standard/mail.c 2 Apr 2001 16:37:50 -0000 1.41 |
4648f0bf | 2 | +++ php4/ext/standard/mail.c 25 Sep 2001 22:48:43 -0000 1.44 |
68abf4df | 3 | @@ -12,7 +12,7 @@ |
4648f0bf | 4 | +----------------------------------------------------------------------+ |
5 | */ | |
6 | ||
7 | -/* $Id$ */ | |
8 | +/* $Id$ */ | |
9 | ||
10 | #include <stdlib.h> | |
11 | #include <ctype.h> | |
4648f0bf | 12 | @@ -54,8 +56,8 @@ |
13 | } | |
14 | ||
15 | convert_to_string_ex(pstr); | |
16 | - if ((*pstr)->value.str.val) { | |
17 | - str = (*pstr)->value.str.val; | |
18 | + if (Z_STRVAL_PP(pstr)) { | |
19 | + str = Z_STRVAL_PP(pstr); | |
20 | } else { | |
21 | php_error(E_WARNING, "Must give string parameter to ezmlm_hash()"); | |
22 | RETURN_FALSE; | |
4648f0bf | 23 | @@ -85,8 +88,8 @@ |
24 | } | |
25 | /* To: */ | |
26 | convert_to_string_ex(argv[0]); | |
27 | - if ((*argv[0])->value.str.val) { | |
28 | - to = (*argv[0])->value.str.val; | |
29 | + if (Z_STRVAL_PP(argv[0])) { | |
30 | + to = Z_STRVAL_PP(argv[0]); | |
31 | } else { | |
32 | php_error(E_WARNING, "No to field in mail command"); | |
33 | RETURN_FALSE; | |
34 | @@ -94,8 +97,8 @@ | |
35 | ||
36 | /* Subject: */ | |
37 | convert_to_string_ex(argv[1]); | |
38 | - if ((*argv[1])->value.str.val) { | |
4648f0bf | 39 | + if (Z_STRVAL_PP(argv[1])) { |
68abf4df | 40 | subject = Z_STRVAL_PP(argv[1]); |
4648f0bf | 41 | } else { |
42 | php_error(E_WARNING, "No subject field in mail command"); | |
43 | RETURN_FALSE; | |
44 | @@ -103,8 +106,8 @@ | |
45 | ||
46 | /* message body */ | |
47 | convert_to_string_ex(argv[2]); | |
48 | - if ((*argv[2])->value.str.val) { | |
4648f0bf | 49 | + if (Z_STRVAL_PP(argv[2])) { |
68abf4df | 50 | message = Z_STRVAL_PP(argv[2]); |
4648f0bf | 51 | } else { |
52 | /* this is not really an error, so it is allowed. */ | |
53 | php_error(E_WARNING, "No message string in mail command"); |